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

# Conflicts: # src/entities/alarm/ui/alarm-item.tsx # src/entities/alarm/ui/alarm-list.tsx
2025-11-04 16:44:02 +09:00
parent 47bd25f7e3 5375e40768
commit 81d50731ec
5 changed files with 76 additions and 76 deletions
--- a/src/entities/additional-service/ui/link-payment/detail/link-payment-history-detail.tsx
+++ b/src/entities/additional-service/ui/link-payment/detail/link-payment-history-detail.tsx
@@ -43,20 +43,13 @@ export const LinkPaymentHistoryDetail = ({
  const { t } = useTranslation();
  const { navigate } = useNavigate();
  const location = useLocation();
-  
+
  const [titleInfo, setTitleInfo] = useState<TitleInfo>();
  const [detailInfo, setDetailInfo] = useState<DetailInfo>();
  const [paymentInfo, setPaymentInfo] = useState<PaymentInfo>();
  const [detailExposure, setDetailExposure] = useState<boolean>(false);
  const [showPayment, setShowPayment] = useState<boolean>(false);

-  useSetHeaderTitle(t('additionalService.linkPayment.detailTitle'));
-  useSetHeaderType(HeaderType.RightClose);
-  useSetOnBack(() => {
-    navigate(-1); // Go back using browser history
-  });
-  useSetFooterMode(false);
-
  const { mutateAsync: linkPayHistoryDetail } = useExtensionLinkPayHistoryDetailMutation();
  const { mutateAsync: linkPayHistoryResend } = useExtensionLinkPayHistoryResendMutation();

@@ -193,7 +186,7 @@ export const LinkPaymentHistoryDetail = ({
                detailInfo={detailInfo}
              ></DetailInfoWrap>
              <div className="detail-divider"></div>
-              <div className="link-payment-detail-button" style={{ paddingBottom: '85px' }}>
+              <div className="link-payment-detail-button" style={{ paddingBottom: '100px' }}>
                <button
                  className="btn-50 btn-blue flex-1"
                  onClick={() => onClickToSeparateApproval()}
--- a/src/entities/additional-service/ui/link-payment/link-payment-history-wrap.tsx
+++ b/src/entities/additional-service/ui/link-payment/link-payment-history-wrap.tsx
@@ -49,31 +49,31 @@ export const LinkPaymentHistoryWrap = () => {
 	const [sendMethod, setSendMethod] = useState<LinkPaymentSendMethod>(LinkPaymentSendMethod.ALL);
 	const [emailBottomSheetOn, setEmailBottomSheetOn] = useState<boolean>(false);
 	const [detailOn, setDetailOn] = useState<boolean>(false);
-  const [detailMid, setDetailMid] = useState<string>('');
-  const [detailRequestId, setDetailRequestId] = useState<string>('');
+	const [detailMid, setDetailMid] = useState<string>('');
+	const [detailRequestId, setDetailRequestId] = useState<string>('');
 	const [detailSubReqId, setDetailSubReqId] = useState<string>('');

 	const { mutateAsync: linkPayHistoryList } = useExtensionLinkPayHistoryListMutation();
 	const { mutateAsync: downloadExcel } = useExtensionLinkPayHistoryDownloadExcelMutation();
 	const onIntersect: IntersectionObserverCallback = (entries: Array<IntersectionObserverEntry>) => {
-    entries.forEach((entry: IntersectionObserverEntry) => {
-      if(entry.isIntersecting){
-        console.log('Element is now intersecting with the root. [' + onActionIntersect + ']');
-        if(onActionIntersect && !!pageParam.cursor){
+		entries.forEach((entry: IntersectionObserverEntry) => {
+			if (entry.isIntersecting) {
+				console.log('Element is now intersecting with the root. [' + onActionIntersect + ']');
+				if (onActionIntersect && !!pageParam.cursor) {
 					setOnActionIntersect(false);
-          callList('page');
-        } 
-      }
-      else{
-        console.log('Element is no longer intersecting with the root.');
-      }
-    });
-  };
+					callList('page');
+				}
+			}
+			else {
+				console.log('Element is no longer intersecting with the root.');
+			}
+		});
+	};

-	const { setTarget } = useIntersectionObserver({ 
-    threshold: 1, 
-    onIntersect 
-  });
+	const { setTarget } = useIntersectionObserver({
+		threshold: 1,
+		onIntersect
+	});

 	const onClickToNavigate = () => {
 		navigate(PATHS.additionalService.linkPayment.request)
@@ -95,40 +95,40 @@ export const LinkPaymentHistoryWrap = () => {
 				...{ sortType: sortType }
 			}
 		};
-		if(type !== 'page' && listParams.page){
-      listParams.page.cursor = null;
-    }
+		if (type !== 'page' && listParams.page) {
+			listParams.page.cursor = null;
+		}

 		linkPayHistoryList(listParams).then((rs) => {
-			if(type === 'page'){
-        setListItems([
-          ...listItems,
-          ...rs.content
-        ]);
-      }
-      else{
-        setListItems(rs.content);
-      }
-			if(rs.hasNext 
+			if (type === 'page') {
+				setListItems([
+					...listItems,
+					...rs.content
+				]);
+			}
+			else {
+				setListItems(rs.content);
+			}
+			if (rs.hasNext
 				&& rs.nextCursor !== pageParam.cursor
-        && rs.content.length === DEFAULT_PAGE_PARAM.size
-      ){
-        setPageParam({
-          ...pageParam,
-          ...{ cursor: rs.nextCursor }
-        });
-      }
-      else{
-        setPageParam({
-          ...pageParam,
-          ...{ cursor: null }
-        });
-      }
+				&& rs.content.length === DEFAULT_PAGE_PARAM.size
+			) {
+				setPageParam({
+					...pageParam,
+					...{ cursor: rs.nextCursor }
+				});
+			}
+			else {
+				setPageParam({
+					...pageParam,
+					...{ cursor: null }
+				});
+			}
 			setOnActionIntersect(
-        !!rs.hasNext
-				&& rs.nextCursor !== pageParam.cursor 
-        && rs.content.length === DEFAULT_PAGE_PARAM.size
-      );
+				!!rs.hasNext
+				&& rs.nextCursor !== pageParam.cursor
+				&& rs.content.length === DEFAULT_PAGE_PARAM.size
+			);
 		});
 	};

@@ -170,13 +170,13 @@ export const LinkPaymentHistoryWrap = () => {

 	const setDetailData = (detailData: DetailData) => {
 		setDetailOn(detailData.detailOn);
-		if(detailData.mid){
+		if (detailData.mid) {
 			setDetailMid(detailData.mid);
 		}
-		if(detailData.requestId){
+		if (detailData.requestId) {
 			setDetailRequestId(detailData.requestId);
 		}
-		if(detailData.subReqId){
+		if (detailData.subReqId) {
 			setDetailSubReqId(detailData.subReqId);
 		}
 	};
@@ -250,12 +250,12 @@ export const LinkPaymentHistoryWrap = () => {
 			</div>

 			<LinkPaymentHistoryList
-				listItems={ listItems }
-				additionalServiceCategory={ AdditionalServiceCategory.LinkPaymentHistory }
-				mid={ mid }
-				setDetailData={ setDetailData }
+				listItems={listItems}
+				additionalServiceCategory={AdditionalServiceCategory.LinkPaymentHistory}
+				mid={mid}
+				setDetailData={setDetailData}
 			></LinkPaymentHistoryList>
-			<div ref={ setTarget }></div>
+			<div ref={setTarget}></div>
 			<div className="apply-row">
 				<button
 					className="btn-50 btn-blue flex-1"
@@ -283,11 +283,11 @@ export const LinkPaymentHistoryWrap = () => {
 				setSendMethod={setSendMethod}
 			></LinkPaymentHistoryFilter>
 			<LinkPaymentHistoryDetail
-				detailOn={ detailOn }
-				setDetailOn={ setDetailOn }
-				mid={ detailMid }
-				requestId={ detailRequestId }
-				subReqId={ detailSubReqId }
+				detailOn={detailOn}
+				setDetailOn={setDetailOn}
+				mid={detailMid}
+				requestId={detailRequestId}
+				subReqId={detailSubReqId}
 			></LinkPaymentHistoryDetail>
 			<EmailBottomSheet
 				bottomSheetOn={emailBottomSheetOn}
--- a/src/entities/alarm/ui/alarm-item.tsx
+++ b/src/entities/alarm/ui/alarm-item.tsx
@@ -40,10 +40,16 @@ export const AlarmItem = ({
  const [appNotificationCategoryName, setAppNotificationCategoryName] = useState<string>('');

  const getCategoryName = () => {
-    let myCategory = appNotificationCategories.filter((value, index) => {
-      return value.code1 === appNotificationCategory;
-    });
-    return myCategory[0].desc1;
+    const categoryMap: { [key: string]: string } = {
+      '10': t('alarm.categories.benefits'),
+      '20': t('alarm.categories.notice'),
+      '30': t('alarm.categories.serviceGuide'),
+      '40': t('alarm.categories.etc'),
+      '60': t('alarm.categories.settlement'),
+      '61': t('alarm.categories.settlementStatus'),
+      '62': t('alarm.categories.settlementLimit')
+    };
+    return categoryMap[appNotificationCategory || ''] || '';
  };
  const onClickToNavigate = () => {
    
--- a/src/entities/alarm/ui/alarm-list.tsx
+++ b/src/entities/alarm/ui/alarm-list.tsx
@@ -103,6 +103,7 @@ export const AlarmList = ({
    for(let i=0;i<resultList.length;i++){
      rs.push(
        <AlarmItem
+          key={i}
          appNotificationSequence={ resultList[i]?.appNotificationSequence }
          appNotificationCategory={ resultList[i]?.appNotificationCategory }
          notificationReceivedDate={ resultList[i]?.notificationReceivedDate }
--- a/src/locales/ko.json
+++ b/src/locales/ko.json
@@ -980,7 +980,7 @@
            "linkContent": "링크내용",
            "basic": "기본",
            "additional": "추가",
-            "sendHistory": "발송 이력",
+            "sendHistory": "발송 내역",
            "pendingSend": "발송 대기",
            "phoneOrEmail": "휴대폰번호/이메일",
            "transactionStatus": "거래 상태",
@@ -1192,7 +1192,7 @@
            "delete": "삭제",
            "separateApprovalDetail": "분리승인 상세",
            "warning": "경고",
-            "shippingHistory": "발송 이력",
+            "shippingHistory": "발송 내역",
            "pendingSend": "발송 대기",
            "all": "전체",
            "incompleteActive": "미완료/활성화",