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 c2077e3..05c475e 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 @@ -294,21 +294,21 @@ export const FundAccountResultListWrap = () => { {t('additionalService.common.request')} {t('home.money', { value: new Intl.NumberFormat('en-US').format(totalRequestAmount) })} - ({new Intl.NumberFormat('en-US').format(totalRequestCount)}{t('home.count')}) + ({t('home.count', { value: new Intl.NumberFormat('en-US').format(totalRequestCount) })})
  • {t('additionalService.common.success')} {t('home.money', { value: new Intl.NumberFormat('en-US').format(totalSuccessAmount) })} - ({new Intl.NumberFormat('en-US').format(totalSuccessCount)}{t('home.count')}) + ({t('home.count', { value: new Intl.NumberFormat('en-US').format(totalSuccessCount) })})
  • {t('additionalService.common.fail')} {t('home.money', { value: new Intl.NumberFormat('en-US').format(totalFailAmount) })} - ({new Intl.NumberFormat('en-US').format(totalFailCount)}{t('home.count')}) + ({t('home.count', { value: new Intl.NumberFormat('en-US').format(totalFailCount) })})
  • diff --git a/src/entities/home/ui/day-status-box-container1.tsx b/src/entities/home/ui/day-status-box-container1.tsx index b9ef7d6..0725012 100644 --- a/src/entities/home/ui/day-status-box-container1.tsx +++ b/src/entities/home/ui/day-status-box-container1.tsx @@ -1,5 +1,4 @@ import moment from 'moment'; -import { NumericFormat } from 'react-number-format'; import { useEffect, useState } from 'react'; import { IMAGE_ROOT } from '@/shared/constants/common'; import { useHomeTodayMutation } from '../api/use-home-today-mutation'; @@ -74,13 +73,8 @@ export const BoxContainer1 = () => { {t('home.money', { value: new Intl.NumberFormat('en-US').format(sales?.todayTotalAmount || 0) })} = 0)? 'plus': 'minus'}` }> - = 0)? '↑ ': '↓ '}` } - suffix='%' - > + {(increaseRate && increaseRate >= 0) ? '↑ ' : '↓ '} + {new Intl.NumberFormat('en-US').format(Math.abs(increaseRate || 0))}% {
  • {t('home.approvalCount')} - + {t('home.count', { value: new Intl.NumberFormat('en-US').format(sales?.totalCount || 0) })}
  • {t('home.cancelCount')} - + {t('home.count', { value: new Intl.NumberFormat('en-US').format(sales?.cancelCount || 0) })}
  • @@ -134,12 +118,7 @@ export const BoxContainer1 = () => {
    {t('home.settlementLimit')} - + {new Intl.NumberFormat('en-US').format(availableLimit || 0)}{t('home.percentRemaining')}
    diff --git a/src/entities/home/ui/day-status-box-container2.tsx b/src/entities/home/ui/day-status-box-container2.tsx index 9a24894..e8801b3 100644 --- a/src/entities/home/ui/day-status-box-container2.tsx +++ b/src/entities/home/ui/day-status-box-container2.tsx @@ -4,7 +4,6 @@ import { IMAGE_ROOT } from '@/shared/constants/common'; import { HomeMonthParams, HomeMonthResponse, HomeOverviewParams, HomeOverviewResponse, Sales, Settlement, TopPaymentMethodInfo, TopSalesDayInfo, TopSalesTimeInfo } from '../model/types'; import { useHomeOverviewMutation } from '../api/use-home-overview-mutation'; import { useHomeMonthwMutation } from '../api/use-home-month-mutation'; -import { NumericFormat } from 'react-number-format'; import { useNavigate } from '@/shared/lib/hooks'; import { PATHS } from '@/shared/constants/paths'; import { useStore } from '@/shared/model/store'; @@ -115,13 +114,8 @@ export const BoxContainer2 = () => { {t('home.money', { value: new Intl.NumberFormat('en-US').format(sales?.currentMonthAmount || 0) })} = 0)? 'plus': 'minus'}` }> - = 0)? '↑ ': '↓ '}` } - suffix='%' - > + {(salesIncrease && salesIncrease >= 0) ? '↑ ' : '↓ '} + {new Intl.NumberFormat('en-US').format(Math.abs(salesIncrease || 0))}% { {t('home.money', { value: new Intl.NumberFormat('en-US').format(settlement?.currentMonthSettlementAmount || 0) })} = 0)? 'plus': 'minus'}` }> - = 0)? '↑ ': '↓ '}` } - suffix='%' - > + {(settlementIncrease && settlementIncrease >= 0) ? '↑ ' : '↓ '} + {new Intl.NumberFormat('en-US').format(Math.abs(settlementIncrease || 0))}% {
    {t('home.money', { value: new Intl.NumberFormat('en-US').format(dailyAverageSales || 0) })} - () + ({t('home.count', { value: new Intl.NumberFormat('en-US').format(dailyAverageCount || 0) })})