Merge remote-tracking branch 'origin/main'

Resolved conflicts in:
- account-holder-auth-list.tsx
- list-item.tsx
- account-holder-auth-page.tsx

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

src/entities/additional-service/ui/account-holder-auth/account-holder-auth-list.tsx

@@ -1,12 +1,11 @@
 import { ListDateGroup } from '../list-date-group';
-import { AdditionalServiceCategory } from '../../model/types';
-import { AccountHolderAuthListProps, AccountHolderAuthItem } from '../../model/account-holder-auth/types';
-import { JSX } from 'react';
+import { AccountHolderAuthListProps } from '../../model/account-holder-auth/types';
 
 export const AccountHolderAuthList = ({
   additionalServiceCategory,
   listItems,
-  mid
+  mid,
+  setDetailData
 }: AccountHolderAuthListProps) => {
 
   const getListDateGroup = () => {
@@ -27,11 +26,12 @@ export const AccountHolderAuthList = ({
             if (list.length > 0) {
               rs.push(
                 <ListDateGroup
-                  additionalServiceCategory={additionalServiceCategory}
-                  key={date + '-' + i}
-                  mid={mid}
-                  date={date}
-                  items={list}
+                  additionalServiceCategory={ additionalServiceCategory }
+                  key={ date + '-' + i }
+                  mid={ mid }
+                  date={ date }
+                  items={ list }
+                  setDetailData={ setDetailData }
                 ></ListDateGroup>
               );
             }
@@ -45,11 +45,12 @@ export const AccountHolderAuthList = ({
     if (list.length > 0) {
       rs.push(
         <ListDateGroup
-          additionalServiceCategory={additionalServiceCategory}
-          mid={mid}
-          key={date + '-last'}
-          date={date}
-          items={list}
+          additionalServiceCategory={ additionalServiceCategory }
+          mid={ mid }
+          key={ date + '-last' }
+          date={ date }
+          items={ list }
+          setDetailData={ setDetailData }
         ></ListDateGroup>
       )
     }

src/entities/additional-service/ui/account-holder-auth/detail/account-holder-auth-detail.tsx

@@ -0,0 +1,126 @@
+import { useEffect, useState } from 'react';
+import { motion } from 'framer-motion';
+import { useNavigate } from '@/shared/lib/hooks/use-navigate';
+import { useLocation } from 'react-router';
+import { useExtensionAccountHolderAuthDetailMutation } from '@/entities/additional-service/api/account-holder-auth/use-extension-account-holder-auth-deatil-mutation';
+import { ExtensionAccountHolderAuthDetailParams, ExtensionAccountHolderAuthDetailResponse } from '@/entities/additional-service/model/account-holder-auth/types';
+import moment from 'moment';
+import { getAuthStatusText } from '@/entities/additional-service/model/account-holder-auth/constant';
+import { getAuthResultStatusText } from '@/entities/additional-service/model/face-auth/constant';
+import { useTranslation } from 'react-i18next';
+import { DetailMotionDuration, DetailMotionStyle, DetailMotionVariants } from '@/entities/common/model/constant';
+import { FullMenuClose } from '@/entities/common/ui/full-menu-close';
+
+export interface AccountHolderAuthDetailProps {
+  detailOn: boolean;
+  setDetailOn: (detailOn: boolean) => void;
+  mid: string;
+  tid: string;
+};
+
+export const AccountHolderAuthDetail = ({
+  detailOn,
+  setDetailOn,
+  mid,
+  tid
+}: AccountHolderAuthDetailProps) => {
+  const { t } = useTranslation();
+  const [detail, setDetail] = useState<ExtensionAccountHolderAuthDetailResponse>();
+
+  const { mutateAsync: accountHolderAuthDetail } = useExtensionAccountHolderAuthDetailMutation();
+
+  const callDetail = () => {
+    let accountHolderAuthDetailParams: ExtensionAccountHolderAuthDetailParams = {
+      mid: mid,
+      tid: tid
+    }
+    accountHolderAuthDetail(accountHolderAuthDetailParams).then((rs: ExtensionAccountHolderAuthDetailResponse) => {
+        setDetail(rs);
+    });
+  };
+  const onClickToClose = () => {
+    setDetailOn(false);
+  };
+
+  const getDate = (date?: string) => {
+    return (date) ? moment(date, 'YYYYMMDDHHmmss').format('YYYY.MM.DD HH:mm:ss') : '';
+  };
+
+  useEffect(() => {
+    if(!!mid && !!tid){
+      callDetail();
+    }
+  }, [mid, tid]);
+  
+  return (
+    <>
+      <motion.div 
+        className="full-menu-modal" 
+        initial="hidden"
+        animate={ (detailOn)? 'visible': 'hidden' }
+        variants={ DetailMotionVariants }
+        transition={ DetailMotionDuration }
+        style={ DetailMotionStyle }
+      >
+        <div className="full-menu-container pdw-16">
+          <div className="full-menu-header">
+            <div className="full-menu-title center">{ t('additionalService.accountHolderAuth.detailTitle') }</div>
+            <div className="full-menu-actions">
+              <FullMenuClose
+                addClass="full-menu-close"
+                onClickToCallback={ onClickToClose }
+              ></FullMenuClose>
+            </div>
+          </div>
+          <div className="tab-pane sub active">
+            <div className="pay-top">
+              <div className="num-amount">
+                <span className="amount">{detail?.accountName}</span>
+              </div>
+              <span className="num-store">{detail?.accountNo}</span>
+              <div className="num-day">{getDate(detail?.requestDate)}</div>
+            </div>
+            <div className="detail-divider"></div>
+            <div className="pay-detail">
+              <div className="detail-title">{t('transaction.sections.detailInfo')}</div>
+              <ul className="kv-list">
+                <li className="kv-row">
+                  <span className="k">{t('transaction.fields.companyName')}</span>
+                  <span className="v">{detail?.companyName}</span>
+                </li>
+                <li className="kv-row">
+                  <span className="k">{t('transaction.fields.mid')}</span>
+                  <span className="v">{detail?.mid}</span>
+                </li>
+                <li className="kv-row">
+                  <span className="k">{t('additionalService.accountHolderAuth.requestDate')}</span>
+                  <span className="v">{getDate(detail?.requestDate)}</span>
+                </li>
+                <li className="kv-row">
+                  <span className="k">{t('transaction.fields.bank')}</span>
+                  <span className="v">{detail?.bankName}</span>
+                </li>
+                <li className="kv-row">
+                  <span className="k">{t('transaction.fields.accountNo')}</span>
+                  <span className="v">{detail?.accountNo}</span>
+                </li>
+                <li className="kv-row">
+                  <span className="k">{t('transaction.fields.accountHolder')}</span>
+                  <span className="v">{detail?.accountName}</span>
+                </li>
+                <li className="kv-row">
+                  <span className="k">{t('common.result')}</span>
+                  <span className="v">{getAuthStatusText(t)(detail?.authStatus)}</span>
+                </li>
+                <li className="kv-row">
+                  <span className="k">{t('transaction.fields.failureReason')}</span>
+                  <span className="v">{detail?.failReason ? getAuthResultStatusText(t)(detail?.failReason) : '-' }</span>
+                </li>
+              </ul>
+            </div>
+          </div>
+        </div>
+      </motion.div>
+    </>
+  );
+}

src/entities/additional-service/ui/account-holder-search/detail/account-holder-search-detail.tsx

@@ -1,7 +1,6 @@
 import moment from 'moment';
 import { useEffect, useState } from 'react';
 import { motion } from 'framer-motion';
-import { useNavigate } from '@/shared/lib/hooks/use-navigate';
 import { ExtensionAccountHolderSearchDetailParams, ExtensionAccountHolderSearchDetailResponse } from '@/entities/additional-service/model/account-holder-search/types';
 import { useExtensionAccountHolderSearchDetailtMutation } from '@/entities/additional-service/api/account-holder-search/use-extension-account-holder-search-detail-mutation';
 import { getAccountHolderStatusText } from '@/entities/additional-service/model/account-holder-search/constant';

src/entities/additional-service/ui/list-item.tsx

@@ -161,13 +161,13 @@ export const ListItem = ({
     }
     //이하 상세페이지 존재
     else if (additionalServiceCategory === AdditionalServiceCategory.AccountHolderAuth) {
-      navigate(PATHS.additionalService.accountHolderAuth.detail, {
-        state: {
-          additionalServiceCategory: additionalServiceCategory,
+      if(setDetailData && !!mid && !!tid){
+        setDetailData({
           mid: mid,
-          tid: tid
-        }
-      })
+          tid: tid,
+          detailOn: true
+        });
+      }
     }
     else if (additionalServiceCategory === AdditionalServiceCategory.AccountHolderSearch) {
       if (setDetailData && !!mid && !!tid) {
@@ -177,7 +177,6 @@ export const ListItem = ({
           detailOn: true
         });
       }
-
     }
     else if (additionalServiceCategory === AdditionalServiceCategory.LinkPaymentHistory) {
       navigate(PATHS.additionalService.linkPayment.detail, {