diff --git a/src/entities/payment/ui/info-wrap.tsx b/src/entities/payment/ui/info-wrap.tsx index d30c9cb..241fc97 100644 --- a/src/entities/payment/ui/info-wrap.tsx +++ b/src/entities/payment/ui/info-wrap.tsx @@ -58,7 +58,8 @@ export const InfoWrap = () => { const [payType, setPayType] = useState(2); const [itemKey, setItemKey] = useState(''); - const [settlementPeriod, setSettlementPeriod] = useState(); + const [cardSettlementPeriod, setCardSettlementPeriod] = useState(); + const [nonCardSettlementPeriod, setNonCardSettlementPeriod] = useState(); const [generalTabItems, setGeneralTabItems] = useState>([]); const [installmentTabItems, setInstallmentTabItems] = useState>([]); const [moneyPointTabItems, setMoneyPointTabItems] = useState>([]); @@ -175,7 +176,7 @@ export const InfoWrap = () => { }; paymentCard(params).then((rs: PaymentCardResponse) => { - setSettlementPeriod(rs.settlementPeriod); + setCardSettlementPeriod(rs.settlementPeriod); setGeneralTabItems(rs.generalTab.items); setInstallmentTabItems(rs.installmentTab.items); setMoneyPointTabItems(rs.moneyPointTab.items); @@ -193,7 +194,7 @@ export const InfoWrap = () => { }; paymentNonCard(params).then((rs: PaymentNonCardResponse) => { - setSettlementPeriod(rs.settlementPeriod); + setNonCardSettlementPeriod(rs.settlementPeriod); setFeeRanges(rs.accountTransferData.feeRanges); setBankFees(rs.accountTransferData.bankFees); setPaymentFees(rs.mobilePaymentData.paymentFees); @@ -297,7 +298,7 @@ export const InfoWrap = () => { setCardCommissionBottomSheetOn={ setCardCommissionBottomSheetOn } payType={ payType } itemKey={ itemKey } - settlementPeriod={ settlementPeriod } + settlementPeriod={ cardSettlementPeriod } generalTabItems={ generalTabItems } installmentTabItems={ installmentTabItems } moneyPointTabItems= { moneyPointTabItems } @@ -311,6 +312,7 @@ export const InfoWrap = () => { { !!transferCommissionBottomSheetOn && diff --git a/src/shared/constants/local-storage.ts b/src/shared/constants/local-storage.ts index a36bd2d..2a449b1 100644 --- a/src/shared/constants/local-storage.ts +++ b/src/shared/constants/local-storage.ts @@ -15,4 +15,5 @@ export enum StorageKeys { AppVersion = 'APP_VERSION', LogOut = 'LOGOUT', i18nextLng = 'i18nextLng', + UserMid = 'USER_MID', }; diff --git a/src/widgets/navigation/header.tsx b/src/widgets/navigation/header.tsx index a56f4b1..070fefd 100644 --- a/src/widgets/navigation/header.tsx +++ b/src/widgets/navigation/header.tsx @@ -11,6 +11,8 @@ import { ChangeEvent, useEffect, useState } from 'react'; import { AppAlarmUnreadCountParams, AppAlarmUnreadCountResponse, MERCHANT_ADMIN_APP } from '@/entities/alarm/model/types'; import { useAppAlarmUnreadCountMutation } from '@/entities/alarm/api/use-app-alarm-unread-count-mutation'; import { appBridge } from '@/utils/appBridge'; +import { getLocalStorage, setLocalStorage } from '@/shared/lib'; +import { StorageKeys } from '@/shared/constants/local-storage'; export const HeaderNavigation = ({ onBack, @@ -28,7 +30,8 @@ export const HeaderNavigation = ({ const { navigate, - navigateBack + navigateBack, + reload } = useNavigate(); const handleBack = () => { @@ -53,7 +56,9 @@ export const HeaderNavigation = ({ const onChangeToMid = (e: ChangeEvent) => { let value = e.target.value; useStore.getState().UserStore.setMid(value); - setMid(value); + setLocalStorage(StorageKeys.UserMid, value); + reload(); + //setMid(value); }; const callAlarmCount = () => { diff --git a/src/widgets/sub-layout/index.tsx b/src/widgets/sub-layout/index.tsx index ef97c1f..6e10d93 100644 --- a/src/widgets/sub-layout/index.tsx +++ b/src/widgets/sub-layout/index.tsx @@ -39,6 +39,8 @@ import { AlarmLinkOptions } from '@/entities/alarm/model/types'; import { AlarmRoutes } from '@/entities/alarm/ui/alarm-routes'; import { useNavigate } from '@/shared/lib/hooks'; import { PATHS } from '@/shared/constants/paths'; +import { getLocalStorage, setLocalStorage } from '@/shared/lib'; +import { StorageKeys } from '@/shared/constants/local-storage'; export interface ContextType { setOnBack: (onBack: () => void) => void; @@ -69,6 +71,7 @@ export const SubLayout = () => { } = useUserInfo(); const { reload, navigateBack, navigate } = useNavigate(); + const userMid = getLocalStorage(StorageKeys.UserMid); const { menuOn, setMenuOn } = useMenuOnStore(); const { favoriteEditOn, setFavoriteEditOn } = useFavoriteEditOnStore(); @@ -79,8 +82,7 @@ export const SubLayout = () => { const { downloadBottomSheetOn, setDownloadBottomSheetOn } = useDownloadBottomSheetOnStore(); const location = useLocation(); - console.log(location) - + const [isPullToRefreshEnabled, setIsPullToRefreshEnabled] = useState(false); const [onBack, setOnBack] = useState(undefined); const [onRightClick, setOnRightClick] = useState(undefined); @@ -90,7 +92,7 @@ export const SubLayout = () => { const [footerCurrentPage, setFooterCurrentPage] = useState(undefined); const [headerNavigationKey, setHeaderNavigationKey] = useState(1); const [loginSuccess, setLoginSuccess] = useState(false); - const [mid, setMid] = useState(); + const [mid, setMid] = useState(userMid || undefined); const [alarmRoutesOn, setAlarmRoutesOn] = useState(false); const [alarmOptions, setAlarmOptions] = useState(); @@ -111,9 +113,17 @@ export const SubLayout = () => { }; homeGroups(params).then((rs: HomeGroupsResponse) => { useStore.getState().UserStore.setUserMids(rs.mids); - if(!!rs.mids[0]){ - useStore.getState().UserStore.setMid(rs.mids[0]); - setMid(rs.mids[0]); + let userMid = getLocalStorage(StorageKeys.UserMid); + if(!userMid){ + if(rs.mids[0]){ + useStore.getState().UserStore.setMid(rs.mids[0]); + setMid(rs.mids[0]); + setLocalStorage(StorageKeys.UserMid, rs.mids[0]); + } + } + else{ + useStore.getState().UserStore.setMid(userMid); + setMid(userMid); } let options: Array> = rs.mids.map((value, index) => { return {