diff --git a/src/entities/additional-service/model/fund-account/types.ts b/src/entities/additional-service/model/fund-account/types.ts index 8a4b114..98c7d65 100644 --- a/src/entities/additional-service/model/fund-account/types.ts +++ b/src/entities/additional-service/model/fund-account/types.ts @@ -213,7 +213,16 @@ export interface ExtensionFundAccountBalanceParams { mid: string; }; export interface ExtensionFundAccountBalanceResponse { - balance: number; + status: boolean; + error?: { + root? : string; + errorKey?: string; + message?: string; + } + data?: { + balance?: number; + } + }; // 입금확인증 다운로드 diff --git a/src/entities/additional-service/ui/fund-account/detail/result-detail.tsx b/src/entities/additional-service/ui/fund-account/detail/result-detail.tsx index 67a578a..ffc5666 100644 --- a/src/entities/additional-service/ui/fund-account/detail/result-detail.tsx +++ b/src/entities/additional-service/ui/fund-account/detail/result-detail.tsx @@ -17,6 +17,7 @@ import { showAlert } from '@/widgets/show-alert'; import { snackBar } from '@/shared/lib'; import { DepositReceiptSample } from '@/entities/common/ui/deposit-receipt-sample'; import { DepositInfo } from '@/entities/transaction/model/types'; +import { useDownloadBottomSheetOn2Store } from '@/shared/model/store'; export interface FundAccountResultDetailProps { detailOn: boolean; @@ -31,10 +32,9 @@ export const FundAccountResultDetail = ({ tid }: FundAccountResultDetailProps) => { const { t } = useTranslation(); + const { downloadBottomSheetOn2, setDownloadBottomSheetOn2 } = useDownloadBottomSheetOn2Store(); const [detail, setDetail] = useState(); - - const [downloadBottomSheetOn, setDownloadBottomSheetOn] = useState(false); const [depositReceiptSampleOn, setDepositReceiptSampleOn] = useState(false); const { mutateAsync: extensionFundAccountResultDetail } = useExtensionFundAccountResultDetailMutation(); const { mutateAsync: extensionFundAccountDownlaodReceipt } = useExtensionFundAccountDownloadReceiptMutation(); @@ -57,7 +57,7 @@ export const FundAccountResultDetail = ({ }; const onClickToOpenDownloadBottomSheet = () => { - setDownloadBottomSheetOn(true); + setDownloadBottomSheetOn2(true); }; const onRequestDownload = ( @@ -200,17 +200,17 @@ export const FundAccountResultDetail = ({ - {!!downloadBottomSheetOn && + {!!downloadBottomSheetOn2 && } - { depositReceiptSampleOn && + {depositReceiptSampleOn && { mid: mid }; extensionFundAccountBalance(params).then((rs: ExtensionFundAccountBalanceResponse) => { - setBalance(rs.balance); + if (rs.status) { + if (!rs.data?.balance) { + setBalance(0); + } else { + setBalance(balance) + } + } else { + const errorMessage = rs.error?.message || t('additionalService.fundAccount.failRequestBalance'); + setBalance(0); + snackBar(errorMessage) + } }).catch((e: any) => { if (e.response?.data?.error?.message) { snackBar(e.response?.data?.error?.message); diff --git a/src/entities/additional-service/ui/payout/detail/payout-detail.tsx b/src/entities/additional-service/ui/payout/detail/payout-detail.tsx index 3cbb47c..f4a82c7 100644 --- a/src/entities/additional-service/ui/payout/detail/payout-detail.tsx +++ b/src/entities/additional-service/ui/payout/detail/payout-detail.tsx @@ -13,6 +13,7 @@ import { checkGrant } from '@/shared/lib/check-grant'; import { snackBar } from '@/shared/lib'; import { DepositReceiptSample } from '@/entities/common/ui/deposit-receipt-sample'; import { DepositInfo } from '@/entities/transaction/model/types'; +import { useDownloadBottomSheetOn2Store } from '@/shared/model/store'; export interface PayoutDetailProps { detailOn: boolean; @@ -30,10 +31,9 @@ export const PayoutDetail = ({ depositAmount }: PayoutDetailProps) => { const { t } = useTranslation(); - + const { downloadBottomSheetOn2, setDownloadBottomSheetOn2 } = useDownloadBottomSheetOn2Store(); const [detail, setDetail] = useState(); - const [downloadBottomSheetOn, setDownloadBottomSheetOn] = useState(false); const [depositReceiptSampleOn, setDepositReceiptSampleOn] = useState(false); const [depositReceiptData, setDepositReceiptData] = useState(); @@ -60,7 +60,7 @@ export const PayoutDetail = ({ showAlert(t('common.nopermission')); return; } - setDownloadBottomSheetOn(true); + setDownloadBottomSheetOn2(true); }; const onRequestDownload = ( @@ -208,10 +208,10 @@ export const PayoutDetail = ({ - {!!downloadBottomSheetOn && + {!!downloadBottomSheetOn2 &&