nicepayments/nice-app-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source 
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>
This commit is contained in:
HyeonJongKim
2025-11-04 10:33:09 +09:00
parent 86c5421c21 6f0b7f46fc
commit 7e7f0879b5
9 changed files with 177 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/pages/additional-service/account-holder-auth/account-holder-auth-page.tsx
View File

@@ -20,11 +20,12 @@ import { useTranslation } from 'react-i18next';
import { useExtensionAccountHolderAuthDownloadExcelMutation } from '@/entities/additional-service/api/account-holder-auth/use-extension-account-holder-auth-download-excel-mutation';
import { AccountHolderAuthFilter } from '@/entities/additional-service/ui/account-holder-auth/filter/account-holder-auth-filter';
import { useStore } from '@/shared/model/store';
import { AccountHolderAuthListItem, AccountHolderAuthStatus, AccountHolderAuthItem, ExtensionAccountHolderAuthDownloadExcelParams, ExtensionAccountHolderAuthDownloadExcelResponse } from '@/entities/additional-service/model/account-holder-auth/types';
import { AdditionalServiceCategory } from '@/entities/additional-service/model/types';
import { AccountHolderAuthStatus, AccountHolderAuthItem, ExtensionAccountHolderAuthDownloadExcelParams, ExtensionAccountHolderAuthDownloadExcelResponse } from '@/entities/additional-service/model/account-holder-auth/types';
import { AdditionalServiceCategory, DetailData } from '@/entities/additional-service/model/types';
import { EmailBottomSheet } from '@/entities/common/ui/email-bottom-sheet';
import { useExtensionAccessCheck } from '@/shared/lib/hooks/use-extension-access-check';
import useIntersectionObserver from '@/widgets/intersection-observer';
import { AccountHolderAuthDetail } from '@/entities/additional-service/ui/account-holder-auth/detail/account-holder-auth-detail';
export const AccountHolderAuthPage = () => {
const { navigate } = useNavigate();
@@ -46,7 +47,11 @@ export const AccountHolderAuthPage = () => {
const [fromDate, setFromDate] = useState(moment().format('YYYYMMDD'));
const [toDate, setToDate] = useState(moment().format('YYYYMMDD'));
const [authStatus, setAuthStatus] = useState<AccountHolderAuthStatus>(AccountHolderAuthStatus.ALL)
const [detailOn, setDetailOn] = useState<boolean>(false);
const [detailMid, setDetailMid] = useState<string>('');
const [detailTid, setDetailTid] = useState<string>('');
const [emailBottomSheetOn, setEmailBottomSheetOn] = useState<boolean>(false);
useSetHeaderTitle(t('additionalService.accountHolderAuth.title'));
useSetHeaderType(HeaderType.LeftArrow);
useSetFooterMode(false);
@@ -132,6 +137,15 @@ export const AccountHolderAuthPage = () => {
const onClickToAuthStatus = (val: AccountHolderAuthStatus) => {
setAuthStatus(val);
};
const setDetailData = (detailData: DetailData) => {
setDetailOn(detailData.detailOn);
if(detailData.mid){
setDetailMid(detailData.mid);
}
if(detailData.tid){
setDetailTid(detailData.tid);
}
}
const onClickToOpenEmailBottomSheet = () => {
@@ -230,9 +244,10 @@ export const AccountHolderAuthPage = () => {
</div>
</div>
<AccountHolderAuthList
additionalServiceCategory={AdditionalServiceCategory.AccountHolderAuth}
listItems={listItems}
mid={mid}
additionalServiceCategory={ AdditionalServiceCategory.AccountHolderAuth }
listItems={ listItems }
mid={ mid }
setDetailData={ setDetailData }
></AccountHolderAuthList>
<div ref={ setTarget }></div>
</div>
@@ -249,16 +264,20 @@ export const AccountHolderAuthPage = () => {
setStartDate={setFromDate}
setEndDate={setToDate}
setAuthStatus={setAuthStatus}
>
</AccountHolderAuthFilter>
></AccountHolderAuthFilter>
<AccountHolderAuthDetail
detailOn={ detailOn }
setDetailOn={ setDetailOn }
mid={ detailMid }
tid={ detailTid }
></AccountHolderAuthDetail>
<EmailBottomSheet
bottomSheetOn={emailBottomSheetOn}
setBottomSheetOn={setEmailBottomSheetOn}
imageSave={false}
sendEmail={true}
sendRequest={onSendRequest}
/>
></EmailBottomSheet>
</>
);
};