nicepayments/nice-app-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	.env.development
This commit is contained in:
Jay Sheen
2025-11-12 10:40:52 +09:00
parent 73b019e65c 1bbe20873b
commit 698be3c106
10 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.env.development
View File

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

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

@@ -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) => (

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

@@ -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) => (

0
src/entities/home/ui/auth-reguster.tsx → src/entities/home/ui/auth-register.tsx
View File

1
src/entities/user/lib/use-user-info.ts
View File

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

2
src/pages/additional-service/ars/list-page.tsx
View File

@@ -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) => (

2
src/pages/additional-service/payout/list-page.tsx
View File

@@ -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) => (

8
src/pages/home/home-page.tsx
View File

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

6
src/shared/configs/axios/index.ts
View File

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

3
src/shared/ui/assets/css/style-fix.css
View File

@@ -519,4 +519,7 @@ main.pop{
.email-label.active .label-text {
color: blue;
}
.excrow .full-menu-keywords {
width: calc(100% - 20px);
}