From e857b8ac057e12708917e8f3a70aac643cbf4cde Mon Sep 17 00:00:00 2001 From: "focp212@naver.com" Date: Wed, 22 Oct 2025 17:19:16 +0900 Subject: [PATCH] =?UTF-8?q?mid=20=EA=B4=80=EB=A0=A8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/entities/account/ui/user-manage-wrap.tsx | 20 ++-- .../home/ui/day-status-box-container1.tsx | 4 +- .../home/ui/day-status-box-container2.tsx | 6 +- src/entities/home/ui/home-notice-item.tsx | 8 +- src/entities/home/ui/home-notice-list.tsx | 4 +- src/entities/merchant/ui/info-wrap.tsx | 22 ++--- .../merchant/ui/registration-status-wrap.tsx | 22 ++--- .../payment/ui/notification-data-wrap.tsx | 24 +++-- src/entities/settlement/ui/calandar-wrap.tsx | 23 ++--- src/entities/settlement/ui/list-wrap.tsx | 19 ++-- src/entities/support/model/types.ts | 32 ++++-- src/entities/support/ui/notice-item.tsx | 8 +- .../transaction/ui/all-transaction-list.tsx | 8 +- src/entities/transaction/ui/billing-list.tsx | 8 +- .../transaction/ui/cash-receipt-list.tsx | 8 +- src/entities/transaction/ui/escrow-list.tsx | 8 +- src/entities/vat-return/model/types.ts | 2 +- src/entities/vat-return/ui/list-wrap.tsx | 99 +++++++++++-------- src/entities/vat-return/ui/reference-wrap.tsx | 11 ++- src/locales/ko.json | 13 ++- .../password/modify-cancel-password-page.tsx | 14 +-- .../fund-account/transfer-request-page.tsx | 11 ++- src/pages/additional-service/list-page.tsx | 26 ++--- src/pages/support/faq/list-page.tsx | 5 +- src/pages/support/notice/detail-page.tsx | 10 +- src/pages/support/notice/list-page.tsx | 39 ++++---- src/pages/transaction/billing/list-page.tsx | 11 ++- src/shared/@types/error.ts | 11 +++ src/widgets/fallbacks/api-error.tsx | 4 +- 29 files changed, 262 insertions(+), 218 deletions(-) diff --git a/src/entities/account/ui/user-manage-wrap.tsx b/src/entities/account/ui/user-manage-wrap.tsx index 3cd9455..c432de9 100644 --- a/src/entities/account/ui/user-manage-wrap.tsx +++ b/src/entities/account/ui/user-manage-wrap.tsx @@ -1,4 +1,4 @@ -import { useEffect, useState } from 'react'; +import { ChangeEvent, useEffect, useState } from 'react'; import { PATHS } from '@/shared/constants/paths'; import { useNavigate } from '@/shared/lib/hooks/use-navigate'; import { DEFAULT_PAGE_PARAM } from '@/entities/common/model/constant'; @@ -8,16 +8,17 @@ import { UserListItem } from '@/entities/user/model/types'; import { useStore } from '@/shared/model/store'; export const UserManageWrap = () => { + const { navigate } = useNavigate(); const midOptions = useStore.getState().UserStore.selectOptionsMids; const userMid = useStore.getState().UserStore.mid; - - const { navigate } = useNavigate(); - const { mutateAsync: userFind } = useUserFindMutation(); + + const [mid, setMid] = useState(userMid); const [userItems, setUserItems] = useState>([]); const [pageParam, setPageParam] = useState(DEFAULT_PAGE_PARAM); - const [mid, setMid] = useState(userMid); + + const { mutateAsync: userFind } = useUserFindMutation(); - const callList = (mid: string) => { + const callList = () => { setPageParam(pageParam); userFind({ mid: mid, page: pageParam }).then((rs) => { console.log('API Response:', rs); @@ -35,7 +36,7 @@ export const UserManageWrap = () => { }; useEffect(() => { - callList(mid); + callList(); }, [mid]); return ( @@ -44,15 +45,14 @@ export const UserManageWrap = () => {
onChangeMid(e.target.value) } + value={ mid } + onChange={ (e: ChangeEvent) => setMid(e.target.value) } > { midOptions.map((value, index) => ( )) } diff --git a/src/entities/merchant/ui/registration-status-wrap.tsx b/src/entities/merchant/ui/registration-status-wrap.tsx index 37119d8..9a80aeb 100644 --- a/src/entities/merchant/ui/registration-status-wrap.tsx +++ b/src/entities/merchant/ui/registration-status-wrap.tsx @@ -1,4 +1,4 @@ -import { useEffect, useState } from 'react'; +import { ChangeEvent, useEffect, useState } from 'react'; import { useMerchantMidStatusMutation } from '../api/use-merchant-mid-status-mutation'; import { CardApplications, @@ -15,10 +15,10 @@ import { EscrowSection } from './section/escrow-section'; import { useStore } from '@/shared/model/store'; export const RegistrationStatusWrap = () => { - const userMids = useStore.getState().UserStore.userMids; const midOptions = useStore.getState().UserStore.selectOptionsMids; - const mid = useStore.getState().UserStore.mid; + const userMid = useStore.getState().UserStore.mid; + const [mid, setMid] = useState(userMid); const [onlineInfomation, setOnlineInfomation] = useState(); const [offlineInfomation, setOfflineInfomation] = useState(); const [cardApplications, setCardApplications] = useState>(); @@ -27,9 +27,9 @@ export const RegistrationStatusWrap = () => { const [openChild, setOpenChild] = useState(null); const { mutateAsync: merchantMidStatus } = useMerchantMidStatusMutation(); - const callInfo = (selectedMid: string) => { + const callInfo = () => { let params: MerchantMidStatusParams = { - mid: selectedMid + mid: mid }; merchantMidStatus(params).then((rs: MerchantMidStatusResponse) => { setOnlineInfomation(rs.onlineInfomation); @@ -39,28 +39,24 @@ export const RegistrationStatusWrap = () => { }); }; - const onChangeMid = (value: string) => { - callInfo(value); - }; - useEffect(() => { if(!!mid){ - callInfo(mid); + callInfo(); } - }, []); + }, [mid]); return ( <>
onChangeMid(e.target.value) }> + onChangeMid(e.target.value) }> +
-
+
diff --git a/src/pages/transaction/billing/list-page.tsx b/src/pages/transaction/billing/list-page.tsx index b5a7140..56d6285 100644 --- a/src/pages/transaction/billing/list-page.tsx +++ b/src/pages/transaction/billing/list-page.tsx @@ -5,7 +5,16 @@ import { IMAGE_ROOT } from '@/shared/constants/common'; import { PATHS } from '@/shared/constants/paths'; import { useNavigate } from '@/shared/lib/hooks/use-navigate'; import { BillingList } from '@/entities/transaction/ui/billing-list'; -import { BillingListItem, TransactionCategory, BillingRequestStatus, BillingProcessResult, BillingPaymentMethod, BillingSearchType, ListItemProps, BillingListParams, BillingListResponse } from '@/entities/transaction/model/types'; +import { + TransactionCategory, + BillingRequestStatus, + BillingProcessResult, + BillingPaymentMethod, + BillingSearchType, + ListItemProps, + BillingListParams, + BillingListResponse +} from '@/entities/transaction/model/types'; import { useBillingListMutation } from '@/entities/transaction/api/use-billing-list-mutation'; import { useDownloadExcelMutation } from '@/entities/transaction/api/use-download-excel-mutation'; import { DEFAULT_PAGE_PARAM } from '@/entities/common/model/constant'; diff --git a/src/shared/@types/error.ts b/src/shared/@types/error.ts index b2e646e..f23d5be 100644 --- a/src/shared/@types/error.ts +++ b/src/shared/@types/error.ts @@ -1,5 +1,12 @@ import { AxiosError } from 'axios'; +export type NiceAxiosError = AxiosError<{ + errorCode?: string; + code?: string; + message?: string; + data?: any; + status?: string; +}>; export type CBDCAxiosError = AxiosError<{ errorCode?: string; code?: string; @@ -12,3 +19,7 @@ export interface CBDCAxiosFallbackProps { error: CBDCAxiosError; resetErrorBoundary?: (...args: unknown[]) => void; } +export interface NiceAxiosFallbackProps { + error: NiceAxiosError; + resetErrorBoundary?: (...args: unknown[]) => void; +} \ No newline at end of file diff --git a/src/widgets/fallbacks/api-error.tsx b/src/widgets/fallbacks/api-error.tsx index 1c27b19..8be0786 100644 --- a/src/widgets/fallbacks/api-error.tsx +++ b/src/widgets/fallbacks/api-error.tsx @@ -8,7 +8,7 @@ type CommonErrorProps = FallbackProps & { height?: number; }; export const APIError = ({ error, resetErrorBoundary }: CommonErrorProps) => { - const { reload } = useNavigate(); + const { navigateBack } = useNavigate(); const msg = useMemo(() => { let message: Partial = { title: '일시적인 오류가 발생하였습니다.', @@ -21,7 +21,7 @@ export const APIError = ({ error, resetErrorBoundary }: CommonErrorProps) => { }, [error]); const handleCancel = () => { - reload(); + navigateBack(); resetErrorBoundary(); };