diff --git a/src/entities/merchant/model/types.ts b/src/entities/merchant/model/types.ts index d25b28b..a358678 100644 --- a/src/entities/merchant/model/types.ts +++ b/src/entities/merchant/model/types.ts @@ -54,7 +54,7 @@ export enum InfoWrapKeys { Escrow = 'Escrow' }; export interface MerchantMidParams { - mid?: string; + mid: string; }; export interface MerchantMidResponse { memberCompanyId?: string; @@ -82,7 +82,7 @@ export interface MerchantMidResponse { accountHolderName?: string; }; export interface MerchantMidStatusParams { - mid?: string; + mid: string; }; export interface MerchantMidStatusResponse { onlineInfomation: OnlineInfomation; diff --git a/src/entities/merchant/ui/info-wrap.tsx b/src/entities/merchant/ui/info-wrap.tsx index 048394c..0b28f44 100644 --- a/src/entities/merchant/ui/info-wrap.tsx +++ b/src/entities/merchant/ui/info-wrap.tsx @@ -14,16 +14,15 @@ export const InfoWrap = () => { const userMids = useStore.getState().UserStore.userMids; const midOptions = useStore.getState().UserStore.selectOptionsMids; - const [mid, setMid] = useState(userMids[0]); const [data, setData] = useState(); const [openChild, setOpenChild] = useState(null); const { mutateAsync: merchantMid } = useMerchantMidMutation(); - const callInfo = (selectedMid?: string) => { + const callInfo = (selectedMid: string) => { let params: MerchantMidParams = { - mid: selectedMid || mid + mid: selectedMid }; merchantMid(params).then((rs: MerchantMidResponse) => { setData(rs); @@ -31,12 +30,13 @@ export const InfoWrap = () => { }; const onChangeMid = (value: string) => { - setMid(value); callInfo(value); }; useEffect(() => { - callInfo(); + if(userMids[0]){ + callInfo(userMids[0]); + } }, []); return ( diff --git a/src/entities/merchant/ui/registration-status-wrap.tsx b/src/entities/merchant/ui/registration-status-wrap.tsx index 34bde7b..47199f0 100644 --- a/src/entities/merchant/ui/registration-status-wrap.tsx +++ b/src/entities/merchant/ui/registration-status-wrap.tsx @@ -18,7 +18,6 @@ export const RegistrationStatusWrap = () => { const userMids = useStore.getState().UserStore.userMids; const midOptions = useStore.getState().UserStore.selectOptionsMids; - const [mid, setMid] = useState(userMids[0]); const [onlineInfomation, setOnlineInfomation] = useState(); const [offlineInfomation, setOfflineInfomation] = useState(); const [cardApplications, setCardApplications] = useState>(); @@ -27,9 +26,9 @@ export const RegistrationStatusWrap = () => { const [openChild, setOpenChild] = useState(null); const { mutateAsync: merchantMidStatus } = useMerchantMidStatusMutation(); - const callInfo = (selectedMid?: string) => { + const callInfo = (selectedMid: string) => { let params: MerchantMidStatusParams = { - mid: selectedMid || mid + mid: selectedMid }; merchantMidStatus(params).then((rs: MerchantMidStatusResponse) => { setOnlineInfomation(rs.onlineInfomation); @@ -40,12 +39,13 @@ export const RegistrationStatusWrap = () => { }; const onChangeMid = (value: string) => { - setMid(value); callInfo(value); }; useEffect(() => { - callInfo(); + if(userMids[0]){ + callInfo(userMids[0]); + } }, []); return (