diff --git a/src/entities/common/model/types.ts b/src/entities/common/model/types.ts index eac29ac..a66a064 100644 --- a/src/entities/common/model/types.ts +++ b/src/entities/common/model/types.ts @@ -77,6 +77,7 @@ export interface HeaderNavigationProps { setMenuOn: (menuOn: boolean) => void; favoriteEdit?: boolean; loginSuccess: boolean; + mid?: string; setMid: (mid: string) => void; }; diff --git a/src/entities/merchant/ui/info-wrap.tsx b/src/entities/merchant/ui/info-wrap.tsx index 30322f8..af3bdf9 100644 --- a/src/entities/merchant/ui/info-wrap.tsx +++ b/src/entities/merchant/ui/info-wrap.tsx @@ -15,8 +15,11 @@ export const InfoWrap = () => { const { t } = useTranslation(); const midOptionsWithoutGids = useStore.getState().UserStore.selectOptionsMidsWithoutGids; const userMid = useStore.getState().UserStore.mid; + let midItem = midOptionsWithoutGids.filter((value, index) => { + return value.value === userMid; + }); - const [mid, setMid] = useState(userMid); + const [mid, setMid] = useState((midItem.length > 0)? userMid: ''); const [data, setData] = useState(); const [openChild, setOpenChild] = useState(null); diff --git a/src/entities/merchant/ui/registration-status-wrap.tsx b/src/entities/merchant/ui/registration-status-wrap.tsx index 0ccf9a1..1d95112 100644 --- a/src/entities/merchant/ui/registration-status-wrap.tsx +++ b/src/entities/merchant/ui/registration-status-wrap.tsx @@ -17,10 +17,13 @@ import { useStore } from '@/shared/model/store'; export const RegistrationStatusWrap = () => { const { t } = useTranslation(); - const midOptionsWithoutGids = useStore.getState().UserStore.selectOptionsMidsWithoutGids; + const midOptions = useStore.getState().UserStore.selectOptionsMidsWithoutGids; const userMid = useStore.getState().UserStore.mid; + let midItem = midOptions.filter((value, index) => { + return value.value === userMid; + }); - const [mid, setMid] = useState(userMid); + const [mid, setMid] = useState((midItem.length > 0)? userMid: ''); const [onlineInfomation, setOnlineInfomation] = useState(); const [offlineInfomation, setOfflineInfomation] = useState(); const [cardApplications, setCardApplications] = useState>(); @@ -55,7 +58,7 @@ export const RegistrationStatusWrap = () => { onChange={ (e: ChangeEvent) => setMid(e.target.value) } > { - midOptionsWithoutGids.map((value, index) => ( + midOptions.map((value, index) => (