diff --git a/src/entities/settlement/ui/list-wrap.tsx b/src/entities/settlement/ui/list-wrap.tsx index c10b152..ccf17c6 100644 --- a/src/entities/settlement/ui/list-wrap.tsx +++ b/src/entities/settlement/ui/list-wrap.tsx @@ -54,6 +54,13 @@ export const ListWrap = ({ const { navigate } = useNavigate(); const { t, i18n } = useTranslation(); const userMid = useStore.getState().UserStore.mid; + + const defaultParams = { + periodType: SettlementPeriodType.SETTLEMENT_DATE, + startDate: startDateFromCalendar? moment(startDateFromCalendar).format('YYYYMMDD'): moment().format('YYYYMMDD'), + endDate: endDateFromCalendar? moment(endDateFromCalendar).format('YYYYMMDD'): moment().format('YYYYMMDD'), + paymentMethod: SettlementPaymentMethod.ALL + }; const [onActionIntersect, setOnActionIntersect] = useState(false); @@ -63,10 +70,10 @@ export const ListWrap = ({ const [filterOn, setFilterOn] = useState(false); const [pageParam, setPageParam] = useState(DEFAULT_PAGE_PARAM); const [mid, setMid] = useState(userMid); - const [periodType, setPeriodType] = useState(SettlementPeriodType.SETTLEMENT_DATE); - const [startDate, setStartDate] = useState(startDateFromCalendar? moment(startDateFromCalendar).format('YYYYMMDD'): moment().format('YYYYMMDD')); - const [endDate, setEndDate] = useState(endDateFromCalendar? moment(endDateFromCalendar).format('YYYYMMDD'): moment().format('YYYYMMDD')); - const [paymentMethod, setPaymentMethod] = useState(SettlementPaymentMethod.ALL); + const [periodType, setPeriodType] = useState(defaultParams.periodType); + const [startDate, setStartDate] = useState(defaultParams.startDate); + const [endDate, setEndDate] = useState(defaultParams.endDate); + const [paymentMethod, setPaymentMethod] = useState(defaultParams.paymentMethod); const [settlementAmount, setSettlementAmount] = useState(); const [transactionAmount, setTransactionAmount] = useState(); @@ -92,6 +99,8 @@ export const ListWrap = ({ const [listHeight, setListHeight] = useState(0); + const [filterUsed, setFilterUsed] = useState(false); + const { mutateAsync: settlementsHistory } = useSettlementsHistoryMutation(); const { mutateAsync: settlementsHistorySummary} = useSettlementsHistorySummaryMutation(); const { mutateAsync: settlementsTransactionList } = useSettlementsTransactionListMutation(); @@ -426,8 +435,21 @@ export const ListWrap = ({ } }; + const checkUsedFilter = () => { + let rs: boolean = true; + if(periodType === defaultParams.periodType + && startDate === defaultParams.startDate + && endDate === defaultParams.endDate + && paymentMethod === defaultParams.paymentMethod + ){ + rs = false; + } + setFilterUsed(rs); + }; + useEffect(() => { callList(); + checkUsedFilter(); }, [ mid, periodType, sortType, startDate, endDate, @@ -469,6 +491,9 @@ export const ListWrap = ({ alt={t('transaction.searchOptions')} onClick={ () => onClickToOpenFilter() } /> + { filterUsed && + + }