- getListDateGroup 수정

- 알림톡 필터 추가
- 일부 부가서비스 엑셀다운로드 바텀시트 추가

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

@@ -1,5 +1,5 @@
 import moment from 'moment';
-import { SortTypeKeys } from '@/entities/common/model/types';
+import { DefaultRequestPagination, SortTypeKeys } from '@/entities/common/model/types';
 import { IMAGE_ROOT } from '@/shared/constants/common';
 import { useNavigate } from '@/shared/lib/hooks/use-navigate';
 import { JSX, useEffect, useState } from 'react';
@@ -16,38 +16,17 @@ import { SortTypeBox } from '@/entities/common/ui/sort-type-box';
 import { FundAccountResultStatusBtnGroup, FundAccountStatusBtnGroup } from '../../model/fund-account/constant';
 import { FundAccountResultFilter } from '../filter/fund-account-result-filter';
 import { useStore } from '@/shared/model/store';
-import useIntersectionObserver from '@/widgets/intersection-observer';
+import { EmailBottomSheet } from '@/entities/common/ui/email-bottom-sheet';
 
 export const FundAccountResultListWrap = () => {
   const { navigate } = useNavigate();
 
-  const [onActionIntersect, setOnActionIntersect] = useState<boolean>(false);
-  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) {
-          callList();
-        }
-      }
-      else {
-        console.log('Element is no longer intersecting with the root.');
-      }
-    });
-  };
-
-  const { setTarget } = useIntersectionObserver({
-    threshold: 1,
-    onIntersect
-  });
-
   const userMid = useStore.getState().UserStore.mid;
 
   const [sortType, setSortType] = useState<SortTypeKeys>(SortTypeKeys.LATEST);
   const [listItems, setListItems] = useState<Array<FundAccountResultContentItem>>([]);
   const [filterOn, setFilterOn] = useState<boolean>(false);
-  const [nextCursor, setNextCursor] = useState<string | null>(null);
-  const [pageParam, setPageParam] = useState(DEFAULT_PAGE_PARAM);
+  const [pageParam, setPageParam] = useState<DefaultRequestPagination>(DEFAULT_PAGE_PARAM);
 
   const [mid, setMid] = useState<string>(userMid);
   const [searchCl, setSearchCl] = useState<FundAccountSearchCl>(FundAccountSearchCl.ACCOUNT_NAME);
@@ -74,49 +53,28 @@ export const FundAccountResultListWrap = () => {
 
   const callList = (option?: {
     sortType?: SortTypeKeys,
-    resultStatus?: FundAccountResultStatus,
-    resetPage?: boolean
+    resultStatus?: FundAccountResultStatus
   }) => {
-    setOnActionIntersect(false);
-
-    const currentPageParam = option?.resetPage
-      ? { ...DEFAULT_PAGE_PARAM, sortType: option?.sortType ?? sortType }
-      : { ...pageParam, sortType: option?.sortType ?? sortType };
-
-    setPageParam(currentPageParam);
-
     let listSummaryParams: ExtensionFundAccountResultListParams = {
       mid: mid,
       searchCl: searchCl,
       searchValue: searchValue,
       searchDateType: searchDateType,
-      fromDate: '20240901',
-      toDate: '20250930',
+      fromDate: fromDate,
+      toDate: toDate,
       bankCode: bankCode,
       resultStatus: option?.resultStatus ?? resultStatus,
-      ... {
-        page: currentPageParam
-      }
+      page: pageParam
     };
 
+    if (listSummaryParams.page) {
+      listSummaryParams.page.sortType = option?.sortType || sortType;
+      setPageParam(listSummaryParams.page);
+    }
+
     extensionFundAccountResultList(listSummaryParams).then((rs: any) => {
       console.log(rs);
-      // resetPage면 기존 리스트 무시, 아니면 추가
-      setListItems(option?.resetPage ? rs.content : [
-        ...listItems,
-        ...rs.content
-      ]);
-      if (rs.hasNext) {
-        setNextCursor(rs.nextCursor);
-        setPageParam({
-          ...currentPageParam,  // pageParam이 아니라 currentPageParam 사용
-          cursor: rs.nextCursor
-        });
-        setOnActionIntersect(true)
-      }
-      else {
-        setNextCursor(null);
-      }
+      setListItems(rs.content);
     });
   };
 
@@ -159,46 +117,46 @@ export const FundAccountResultListWrap = () => {
   const onClickToSort = (sort: SortTypeKeys) => {
     setSortType(sort);
     callList({
-      sortType: sort,
-      resetPage: true
+      sortType: sort
     });
   };
   const onClickToStatus = (val: FundAccountResultStatus) => {
     setResultStatus(val);
     callList({
-      resultStatus: val,
-      resetPage: true
+      resultStatus: val
     });
   };
 
   const getListDateGroup = () => {
-    let rs: JSX.Element[] = [];
+    let rs = [];
     let date = '';
-    let list: FundAccountResultContentItem[] = [];
+    let list = [];
     for (let i = 0; i < listItems.length; i++) {
-      // requestDate format: "20211018140420" (YYYYMMDDHHmmss)
-      let requestDate = listItems[i]?.requestDate || '';
-      let itemDate = requestDate.substring(0, 8);
-      if (i === 0) {
-        date = itemDate;
-      }
-      if (date !== itemDate) {
-        // 날짜가 바뀌면 이전 리스트를 푸시 (날짜 업데이트 전에!)
-        if (list.length > 0) {
-          rs.push(
-            <ListDateGroup
-              additionalServiceCategory={AdditionalServiceCategory.FundAccountResult}
-              mid={mid}
-              key={date + '-' + i}
-              date={date}  // 이전 날짜 사용
-              items={list as any}
-            ></ListDateGroup>
-          );
+      let items = listItems[i];
+      if (!!items) {
+        let requestDate = items?.requestDate;
+        requestDate = requestDate?.substring(0, 8);
+        if (!!requestDate) {
+          if (i === 0) {
+            date = requestDate;
+          }
+          if (date !== requestDate) {
+            date = requestDate;
+            if (list.length > 0) {
+              rs.push(
+                <ListDateGroup
+                  additionalServiceCategory={AdditionalServiceCategory.FundAccountResult}
+                  key={date + '-' + i}
+                  date={date}
+                  items={list}
+                ></ListDateGroup>
+              );
+            }
+            list = [];
+          }
+          list.push(items);
         }
-        date = itemDate;  // 그 다음에 날짜 업데이트
-        list = [];
       }
-      list.push(listItems[i] as any);
     }
     if (list.length > 0) {
       rs.push(
@@ -207,7 +165,7 @@ export const FundAccountResultListWrap = () => {
           mid={mid}
           key={date + '-last'}
           date={date}
-          items={list as any}
+          items={list}
         ></ListDateGroup>
       );
     }
@@ -219,8 +177,7 @@ export const FundAccountResultListWrap = () => {
   }, []);
 
   useEffect(() => {
-    // 필터 조건이 변경되면 첫 페이지부터 다시 시작
-    callList({ resetPage: true });
+    callList();
   }, [
     mid,
     searchCl,
@@ -361,7 +318,6 @@ export const FundAccountResultListWrap = () => {
 
       <section className="transaction-list">
         {getListDateGroup()}
-        <div ref={setTarget}></div>
       </section>
       <div className="apply-row">
         <button