diff --git a/src/entities/alarm/ui/alarm-list.tsx b/src/entities/alarm/ui/alarm-list.tsx index 1943b6c..65f4cb7 100644 --- a/src/entities/alarm/ui/alarm-list.tsx +++ b/src/entities/alarm/ui/alarm-list.tsx @@ -10,6 +10,7 @@ import useIntersectionObserver from '@/widgets/intersection-observer'; import { useStore } from '@/shared/model/store'; import { DefaultRequestPagination } from '@/entities/common/model/types'; import { AlarmRoutes } from './alarm-routes'; +import { showAlert } from '@/widgets/show-alert'; export interface AlarmListProps { appNotificationCategory: string; @@ -92,6 +93,11 @@ export const AlarmList = ({ && rs.content.length === DEFAULT_PAGE_PARAM.size ); } + }).catch((e: any) => { + if(e.response?.data?.error?.message){ + showAlert(e.response?.data?.error?.message); + return; + } }); } diff --git a/src/entities/home/ui/day-status-box-container1.tsx b/src/entities/home/ui/day-status-box-container1.tsx index d8c80af..a84853a 100644 --- a/src/entities/home/ui/day-status-box-container1.tsx +++ b/src/entities/home/ui/day-status-box-container1.tsx @@ -55,6 +55,11 @@ export const BoxContainer1 = () => { } setSettlement(rs.settlement); + }).catch((e: any) => { + if(e.response?.data?.error?.message){ + showAlert(e.response?.data?.error?.message); + return; + } }); }; diff --git a/src/entities/home/ui/day-status-box-container2.tsx b/src/entities/home/ui/day-status-box-container2.tsx index 09e6944..4e32c0c 100644 --- a/src/entities/home/ui/day-status-box-container2.tsx +++ b/src/entities/home/ui/day-status-box-container2.tsx @@ -59,6 +59,11 @@ export const BoxContainer2 = () => { increase = Math.round(increase * 100) / 100; setSettlementIncrease(increase); } + }).catch((e: any) => { + if(e.response?.data?.error?.message){ + showAlert(e.response?.data?.error?.message); + return; + } }); }; @@ -74,6 +79,11 @@ export const BoxContainer2 = () => { setTopSalesDayInfo(rs.topSalesDayInfo); setTopSalesTimeInfo(rs.topSalesTimeInfo); setTopPaymentMethodInfo(rs.topPaymentMethodInfo); + }).catch((e: any) => { + if(e.response?.data?.error?.message){ + showAlert(e.response?.data?.error?.message); + return; + } }); }; diff --git a/src/entities/home/ui/home-banner-list.tsx b/src/entities/home/ui/home-banner-list.tsx index 774829a..3bf2964 100644 --- a/src/entities/home/ui/home-banner-list.tsx +++ b/src/entities/home/ui/home-banner-list.tsx @@ -11,6 +11,7 @@ import { HomeBannerListParams, HomeBannerListResponse } from '../model/types'; +import { showAlert } from '@/widgets/show-alert'; export const HomeBannerList = () => { @@ -31,6 +32,11 @@ export const HomeBannerList = () => { else{ setBannerList([]); } + }).catch((e: any) => { + if(e.response?.data?.error?.message){ + showAlert(e.response?.data?.error?.message); + return; + } }).finally(() => { /* let items = [ diff --git a/src/entities/home/ui/home-notice-list.tsx b/src/entities/home/ui/home-notice-list.tsx index 4aea421..41203cd 100644 --- a/src/entities/home/ui/home-notice-list.tsx +++ b/src/entities/home/ui/home-notice-list.tsx @@ -5,6 +5,7 @@ import { DetailData, NoticeItem } from '@/entities/support/model/types'; import { HomeNoticeItem } from './home-notice-item'; import { useTranslation } from 'react-i18next'; import { NoticeDetail } from '@/entities/support/ui/detail/notice-detail'; +import { showAlert } from '@/widgets/show-alert'; export const HomeNoticeList = () => { const { t } = useTranslation(); @@ -51,6 +52,11 @@ export const HomeNoticeList = () => { noticeList(listParams).then((rs) => { setResultList(rs.content); + }).catch((e: any) => { + if(e.response?.data?.error?.message){ + showAlert(e.response?.data?.error?.message); + return; + } }); }; diff --git a/src/entities/merchant/ui/info-wrap.tsx b/src/entities/merchant/ui/info-wrap.tsx index af3bdf9..116d277 100644 --- a/src/entities/merchant/ui/info-wrap.tsx +++ b/src/entities/merchant/ui/info-wrap.tsx @@ -10,6 +10,7 @@ import { MerchantMidResponse } from '../model/types'; import { useStore } from '@/shared/model/store'; +import { showAlert } from '@/widgets/show-alert'; export const InfoWrap = () => { const { t } = useTranslation(); @@ -32,6 +33,11 @@ export const InfoWrap = () => { }; merchantMid(params).then((rs: MerchantMidResponse) => { setData(rs); + }).catch((e: any) => { + if(e.response?.data?.error?.message){ + showAlert(e.response?.data?.error?.message); + return; + } }); }; diff --git a/src/entities/merchant/ui/registration-status-wrap.tsx b/src/entities/merchant/ui/registration-status-wrap.tsx index 80b757f..3424fc7 100644 --- a/src/entities/merchant/ui/registration-status-wrap.tsx +++ b/src/entities/merchant/ui/registration-status-wrap.tsx @@ -14,6 +14,7 @@ import { OnlineSection } from './section/online-section'; import { CardSection } from './section/card-section'; import { EscrowSection } from './section/escrow-section'; import { useStore } from '@/shared/model/store'; +import { showAlert } from '@/widgets/show-alert'; export const RegistrationStatusWrap = () => { const { t } = useTranslation(); @@ -41,6 +42,11 @@ export const RegistrationStatusWrap = () => { setOfflineInfomation(rs.offlineInfomation); setCardApplications(rs.cardApplications); setEscrow(rs.escrow); + }).catch((e: any) => { + if(e.response?.data?.error?.message){ + showAlert(e.response?.data?.error?.message); + return; + } }); }; diff --git a/src/entities/payment/ui/info-wrap.tsx b/src/entities/payment/ui/info-wrap.tsx index bde465d..3a51ffa 100644 --- a/src/entities/payment/ui/info-wrap.tsx +++ b/src/entities/payment/ui/info-wrap.tsx @@ -33,6 +33,7 @@ import { usePaymentCardMutation } from '../api/use-payment-card-mutation'; import { usePaymentNonCardMutation } from '../api/use-payment-non-card-mutation'; import { usePaymentInstallmentMutation } from '../api/use-payment-installment-mutation'; import { useStore } from '@/shared/model/store'; +import { showAlert } from '@/widgets/show-alert'; export const InfoWrap = () => { const { t } = useTranslation(); @@ -155,6 +156,11 @@ export const InfoWrap = () => { setGeneralTabItems(rs.generalTab.items); setInstallmentTabItems(rs.installmentTab.items); setMoneyPointTabItems(rs.moneyPointTab.items); + }).catch((e: any) => { + if(e.response?.data?.error?.message){ + showAlert(e.response?.data?.error?.message); + return; + } }); }; const callPaymentNonCard = () => { @@ -171,6 +177,11 @@ export const InfoWrap = () => { setPaymentFees(rs.mobilePaymentData.paymentFees); setCategoryFees(rs.mobilePaymentData.categoryFees); setFeeRate(rs.otherPaymentData.feeRate); + }).catch((e: any) => { + if(e.response?.data?.error?.message){ + showAlert(e.response?.data?.error?.message); + return; + } }); }; const callPaymentIntallment = () => { @@ -182,6 +193,11 @@ export const InfoWrap = () => { paymentInstallment(params).then((rs: PaymentInstallmentResponse) => { console.log(rs); setInstallmentData(rs.installmentData); + }).catch((e: any) => { + if(e.response?.data?.error?.message){ + showAlert(e.response?.data?.error?.message); + return; + } }); }; @@ -202,6 +218,11 @@ export const InfoWrap = () => { if(rs.installmentDetails){ setInstallmentDetails(rs.installmentDetails); } + }).catch((e: any) => { + if(e.response?.data?.error?.message){ + showAlert(e.response?.data?.error?.message); + return; + } }); }; const changeToCardCompany = (cardCompany: string) => { diff --git a/src/entities/payment/ui/notification-data-wrap.tsx b/src/entities/payment/ui/notification-data-wrap.tsx index c049c53..f02a7dc 100644 --- a/src/entities/payment/ui/notification-data-wrap.tsx +++ b/src/entities/payment/ui/notification-data-wrap.tsx @@ -4,6 +4,7 @@ import { NotifyRowKeys, PaymentNotificationDataParams, PaymentNotificationDataRe import { usePaymentNotificationDataMutation } from '../api/use-payment-notification-data-mutation'; import { useStore } from '@/shared/model/store'; import { NotifyRow } from './section/notify-row'; +import { showAlert } from '@/widgets/show-alert'; export const NotificationDataWrap = () => { const { t } = useTranslation(); @@ -37,6 +38,11 @@ export const NotificationDataWrap = () => { setVirtualAccount(rs?.virtualAccount.detail); setMobilePayment(rs?.mobilePayment.detail); setEscrowPayment(rs?.escrowPayment.detail); + }).catch((e: any) => { + if(e.response?.data?.error?.message){ + showAlert(e.response?.data?.error?.message); + return; + } }); }; useEffect(() => { diff --git a/src/entities/settlement/ui/calendar-wrap.tsx b/src/entities/settlement/ui/calendar-wrap.tsx index 728a8bb..3c041d5 100644 --- a/src/entities/settlement/ui/calendar-wrap.tsx +++ b/src/entities/settlement/ui/calendar-wrap.tsx @@ -13,6 +13,7 @@ import { SettlementStatus } from '../model/types'; import { useStore } from '@/shared/model/store'; +import { showAlert } from '@/widgets/show-alert'; export const CalendarWrap = () => { const { t, i18n } = useTranslation(); @@ -69,6 +70,11 @@ export const CalendarWrap = () => { setCompletedList(completedArr); setCompletedDateList(completedDateArr); } + }).catch((e: any) => { + if(e.response?.data?.error?.message){ + showAlert(e.response?.data?.error?.message); + return; + } }).finally(() => { let maxYearMonth = moment().format('YYYYMM'); // let maxYearMonthValue = moment(maxYearMonth).format('YYYYMM'); diff --git a/src/entities/settlement/ui/detail/settlement-detail.tsx b/src/entities/settlement/ui/detail/settlement-detail.tsx index 4b8ba22..b465c09 100644 --- a/src/entities/settlement/ui/detail/settlement-detail.tsx +++ b/src/entities/settlement/ui/detail/settlement-detail.tsx @@ -22,6 +22,7 @@ import { useTranslation } from 'react-i18next'; import { FullMenuClose } from '@/entities/common/ui/full-menu-close'; import { DetailMotionDuration, DetailMotionStyle, DetailMotionVariants } from '@/entities/common/model/constant'; import { snackBar } from '@/shared/lib'; +import { showAlert } from '@/widgets/show-alert'; export interface SettlementDetailProps { detailOn: boolean; @@ -71,6 +72,11 @@ export const SettlementDetail = ({ snackBar('데이터가 존재하지 않습니다.'); onClickToClose(); } + }).catch((e: any) => { + if(e.response?.data?.error?.message){ + showAlert(e.response?.data?.error?.message); + return; + } }); } }; diff --git a/src/entities/settlement/ui/list-wrap.tsx b/src/entities/settlement/ui/list-wrap.tsx index 1366e33..b259d44 100644 --- a/src/entities/settlement/ui/list-wrap.tsx +++ b/src/entities/settlement/ui/list-wrap.tsx @@ -169,7 +169,13 @@ export const ListWrap = ({ && rs.nextCursor !== pageParam.cursor && rs.content.length === DEFAULT_PAGE_PARAM.size ); + }).catch((e: any) => { + if(e.response?.data?.error?.message){ + showAlert(e.response?.data?.error?.message); + return; + } }); + settlementsHistorySummary(listSummaryParams).then((rs: SettlementsHistorySummaryResponse) => { setSettlementAmount(rs.settlementAmount || 0); setTransactionAmount(rs.transactionAmount || 0); @@ -177,6 +183,11 @@ export const ListWrap = ({ setHoldAmount(rs.holdAmount || 0); setReleaseAmount(rs.releaseAmount || 0); setOffsetAmount(rs.offsetAmount || 0); + }).catch((e: any) => { + if(e.response?.data?.error?.message){ + showAlert(e.response?.data?.error?.message); + return; + } }); }; const callTransactionList = (type?: string) => { @@ -231,7 +242,13 @@ export const ListWrap = ({ && rs.nextCursor !== pageParam.cursor && rs.content.length === DEFAULT_PAGE_PARAM.size ); + }).catch((e: any) => { + if(e.response?.data?.error?.message){ + showAlert(e.response?.data?.error?.message); + return; + } }); + settlementsTransactionSummary(listSummaryParams).then((rs) => { setSettlementAmount(rs.settlementAmount); setTransactionAmount(rs.transactionAmount); @@ -240,6 +257,11 @@ export const ListWrap = ({ setAuthFeeAmount(rs.authFeeAmount); setVatAmount(rs.vatAmount); setPreSettlementCancelOffset(rs.preSettlementCancelOffset); + }).catch((e: any) => { + if(e.response?.data?.error?.message){ + showAlert(e.response?.data?.error?.message); + return; + } }); }; diff --git a/src/entities/transaction/ui/detail/all-transaction-detail.tsx b/src/entities/transaction/ui/detail/all-transaction-detail.tsx index ffa3eeb..287151f 100644 --- a/src/entities/transaction/ui/detail/all-transaction-detail.tsx +++ b/src/entities/transaction/ui/detail/all-transaction-detail.tsx @@ -77,6 +77,11 @@ export const AllTransactionDetail = ({ setTransactionInfo(rs.transactionInfo); setSettlementInfo(rs.settlementInfo); setPartCancelInfo(rs.partCancelInfo); + }).catch((e: any) => { + if(e.response?.data?.error?.message){ + showAlert(e.response?.data?.error?.message); + return; + } }); }; useEffect(() => { diff --git a/src/entities/transaction/ui/detail/billing-detail.tsx b/src/entities/transaction/ui/detail/billing-detail.tsx index 13100d5..fcf93b5 100644 --- a/src/entities/transaction/ui/detail/billing-detail.tsx +++ b/src/entities/transaction/ui/detail/billing-detail.tsx @@ -13,6 +13,7 @@ import { import { NumericFormat } from 'react-number-format'; import { DetailMotionDuration, DetailMotionStyle, DetailMotionVariants } from '@/entities/common/model/constant'; import { FullMenuClose } from '@/entities/common/ui/full-menu-close'; +import { showAlert } from '@/widgets/show-alert'; export interface BillingDetailProps { detailOn: boolean; @@ -42,6 +43,11 @@ export const BillingDetail = ({ transactionAmount: rs.transactionAmount, buyerName: rs.buyerName }) + }).catch((e: any) => { + if(e.response?.data?.error?.message){ + showAlert(e.response?.data?.error?.message); + return; + } }); }; const onClickToClose = () => { diff --git a/src/entities/transaction/ui/detail/cash-receit-detail.tsx b/src/entities/transaction/ui/detail/cash-receit-detail.tsx index 1109f03..563cad7 100644 --- a/src/entities/transaction/ui/detail/cash-receit-detail.tsx +++ b/src/entities/transaction/ui/detail/cash-receit-detail.tsx @@ -69,7 +69,12 @@ export const CashReceiptDetail = ({ snackBar('용도 변경을 성공하였습니다.', function(){ reload(); }, 2000); - }); + }).catch((e: any) => { + if(e.response?.data?.error?.message){ + showAlert(e.response?.data?.error?.message); + return; + } + }); }; const callDetail = () => { diff --git a/src/entities/transaction/ui/detail/escrow-detail.tsx b/src/entities/transaction/ui/detail/escrow-detail.tsx index d65d968..332838c 100644 --- a/src/entities/transaction/ui/detail/escrow-detail.tsx +++ b/src/entities/transaction/ui/detail/escrow-detail.tsx @@ -85,6 +85,11 @@ export const EscrowDetail = ({ setMerchantInfo(rs.merchantInfo || {}); setOrderNumber(rs.importantInfo?.orderNumber); + }).catch((e: any) => { + if(e.response?.data?.error?.message){ + showAlert(e.response?.data?.error?.message); + return; + } }); }; useEffect(() => {