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

src/entities/additional-service/ui/link-payment/detail/link-payment-history-detail.tsx

@@ -50,13 +50,6 @@ export const LinkPaymentHistoryDetail = ({
   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()}

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) => {
+    const categoryMap: { [key: string]: string } = {
-      return value.code1 === appNotificationCategory;
+      '10': t('alarm.categories.benefits'),
-    });
+      '20': t('alarm.categories.notice'),
-    return myCategory[0].desc1;
+      '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 = () => {
     

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 }

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": "미완료/활성화",