Merge branch 'main' of https://gitea.bpsoft.co.kr/nicepayments/nice-app-web

# Conflicts:
#	.env.development

.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'

src/entities/additional-service/ui/fund-account/result-list-wrap.tsx

@@ -351,7 +351,7 @@ export const FundAccountResultListWrap = () => {
           sortType={sortType}
           onClickToSort={onClickToSort}
         ></SortTypeBox>
-        <div className="excrow mr-0">
+        <div className="excrow">
           <div className="full-menu-keywords no-padding">
             {
               getFundAccountResultStatusBtnGroup(t).map((value: any, index: number) => (

src/entities/additional-service/ui/fund-account/transfer-list-wrap.tsx

@@ -321,7 +321,7 @@ export const FundAccountTransferListWrap = () => {
           sortType={sortType}
           onClickToSort={onClickToSort}
         ></SortTypeBox>
-        <div className="excrow mr-0">
+        <div className="excrow">
           <div className="full-menu-keywords no-padding">
             {
               getFundAccountStatusBtnGroup(t).map((value: any, index: number) => (

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);

src/pages/additional-service/ars/list-page.tsx

@@ -271,7 +271,7 @@ export const ArsListPage = () => {
                 sortType={sortType}
                 onClickToSort={onClickToSort}
               ></SortTypeBox>
-              <div className="excrow mr-0">
+              <div className="excrow">
                 <div className="full-menu-keywords no-padding">
                   {
                     getArsPaymentStatusBtnGroup(t).map((value: any, index: number) => (

src/pages/additional-service/payout/list-page.tsx

@@ -328,7 +328,7 @@ export const PayoutListPage = () => {
                 sortType={sortType}
                 onClickToSort={onClickToSort}
               ></SortTypeBox>
-              <div className="excrow mr-0">
+              <div className="excrow">
                 <div className="full-menu-keywords no-padding">
                   {
                     getPayoutDisbursementStatusBtnGroup(t).map((value: any, index: number) => (

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<boolean>(false);
   const [authRegisterOn, setAuthRegisterOn] = useState<boolean>(false);
-  const [, setFavoriteItems] = useState<Array<UserFavorite>>([]);  
+  const [favoriteItems, setFavoriteItems] = useState<Array<UserFavorite>>([]);  
   const [bannerList, setBannerList] = useState<Array<BannerList>>([]);
 
   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);

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) => {

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);
 }