diff --git a/.env.development b/.env.development index 9fbb029..299350a 100644 --- a/.env.development +++ b/.env.development @@ -1,4 +1,4 @@ -VITE_APP_ENV=development +VITE_APP_ENV=development # VITE_APP_AUTH_PROXY_HOST='http://3.35.79.250:8090' # VITE_APP_API_PROXY_HOST='http://3.35.79.250:8080' VITE_APP_AUTH_PROXY_HOST='https://auth.nicepay.co.kr' diff --git a/src/entities/additional-service/ui/fund-account/result-list-wrap.tsx b/src/entities/additional-service/ui/fund-account/result-list-wrap.tsx index 57146df..8a0c8e5 100644 --- a/src/entities/additional-service/ui/fund-account/result-list-wrap.tsx +++ b/src/entities/additional-service/ui/fund-account/result-list-wrap.tsx @@ -351,7 +351,7 @@ export const FundAccountResultListWrap = () => { sortType={sortType} onClickToSort={onClickToSort} > -
+
{ getFundAccountResultStatusBtnGroup(t).map((value: any, index: number) => ( diff --git a/src/entities/additional-service/ui/fund-account/transfer-list-wrap.tsx b/src/entities/additional-service/ui/fund-account/transfer-list-wrap.tsx index 245d954..558b37f 100644 --- a/src/entities/additional-service/ui/fund-account/transfer-list-wrap.tsx +++ b/src/entities/additional-service/ui/fund-account/transfer-list-wrap.tsx @@ -321,7 +321,7 @@ export const FundAccountTransferListWrap = () => { sortType={sortType} onClickToSort={onClickToSort} > -
+
{ getFundAccountStatusBtnGroup(t).map((value: any, index: number) => ( diff --git a/src/entities/home/ui/auth-reguster.tsx b/src/entities/home/ui/auth-register.tsx similarity index 100% rename from src/entities/home/ui/auth-reguster.tsx rename to src/entities/home/ui/auth-register.tsx diff --git a/src/entities/user/lib/use-user-info.ts b/src/entities/user/lib/use-user-info.ts index 68a4a75..506275b 100644 --- a/src/entities/user/lib/use-user-info.ts +++ b/src/entities/user/lib/use-user-info.ts @@ -44,7 +44,6 @@ export const useUserInfo = () => { }; const updateUserData = (data: LoginResponse) => { - console.log('updateUserData ==> ['+JSON.stringify(data)+']'); setLocalStorage(StorageKeys.TokenType, data.tokenType); setLocalStorage(StorageKeys.AccessToken, data.accessToken); setLocalStorage(StorageKeys.RefreshToken, data.refreshToken); diff --git a/src/pages/additional-service/ars/list-page.tsx b/src/pages/additional-service/ars/list-page.tsx index cad2984..48b2bd3 100644 --- a/src/pages/additional-service/ars/list-page.tsx +++ b/src/pages/additional-service/ars/list-page.tsx @@ -271,7 +271,7 @@ export const ArsListPage = () => { sortType={sortType} onClickToSort={onClickToSort} > -
+
{ getArsPaymentStatusBtnGroup(t).map((value: any, index: number) => ( diff --git a/src/pages/additional-service/payout/list-page.tsx b/src/pages/additional-service/payout/list-page.tsx index 46c2e21..5a6b0e4 100644 --- a/src/pages/additional-service/payout/list-page.tsx +++ b/src/pages/additional-service/payout/list-page.tsx @@ -328,7 +328,7 @@ export const PayoutListPage = () => { sortType={sortType} onClickToSort={onClickToSort} > -
+
{ getPayoutDisbursementStatusBtnGroup(t).map((value: any, index: number) => ( diff --git a/src/pages/home/home-page.tsx b/src/pages/home/home-page.tsx index 12896db..22024d0 100644 --- a/src/pages/home/home-page.tsx +++ b/src/pages/home/home-page.tsx @@ -3,7 +3,7 @@ import { useEffect, useState } from 'react'; import { FavoriteWrapper } from '@/entities/home/ui/favorite-wrapper'; import { DayStatusBox } from '@/entities/home/ui/day-status-box'; import { HomeBottomBanner } from '@/entities/home/ui/home-bottom-banner'; -import { AuthRegister } from '@/entities/home/ui/auth-reguster'; +import { AuthRegister } from '@/entities/home/ui/auth-register'; import { FooterItemActiveKey } from '@/entities/common/model/types'; import { StorageKeys } from '@/shared/constants/local-storage'; import { getLocalStorage } from '@/shared/lib/web-view-bridge'; @@ -46,7 +46,7 @@ export const HomePage = () => { const [bottomBannerOn, setBottomBannerOn] = useState(false); const [authRegisterOn, setAuthRegisterOn] = useState(false); - const [, setFavoriteItems] = useState>([]); + const [favoriteItems, setFavoriteItems] = useState>([]); const [bannerList, setBannerList] = useState>([]); const callHomeBannerList = () => { @@ -95,10 +95,8 @@ export const HomePage = () => { } }).catch((e) => { console.log('catch', e); - }).finally(() => { - console.log('finally'); - setAuthRegisterOn(true); + setAuthRegisterOn(true); }).catch((e: any) => { if(e.response?.data?.error?.message){ snackBar(e.response?.data?.error?.message); diff --git a/src/shared/configs/axios/index.ts b/src/shared/configs/axios/index.ts index 2078e3d..c3e9c86 100644 --- a/src/shared/configs/axios/index.ts +++ b/src/shared/configs/axios/index.ts @@ -4,7 +4,8 @@ import { StorageKeys } from '@/shared/constants/local-storage'; import { checkIsAxiosError, getLocalStorage, - setLocalStorage + setLocalStorage, + snackBar } from '@/shared/lib'; import { appBridge } from '@/utils/appBridge'; import { LoginResponse } from '@/entities/user/model/types'; @@ -58,6 +59,9 @@ const onResponseFulfilled = (response: AxiosResponse) => { const onResponseRejected = (error: AxiosError) => { console.log('onResponseRejected --> ', error); + if(!!error.code && error.code === 'ETIMEDOUT'){ + snackBar(error?.message); + } if(error?.status === 401){ if(appBridge.isNativeEnvironment()){ return appBridge.safeCall(() => appBridge.requestRefreshToken()).then((token: LoginResponse) => { diff --git a/src/shared/ui/assets/css/style-fix.css b/src/shared/ui/assets/css/style-fix.css index f22c213..d7376fa 100644 --- a/src/shared/ui/assets/css/style-fix.css +++ b/src/shared/ui/assets/css/style-fix.css @@ -519,4 +519,7 @@ main.pop{ .email-label.active .label-text { color: blue; +} +.excrow .full-menu-keywords { + width: calc(100% - 20px); } \ No newline at end of file