diff --git a/src/entities/additional-service/ui/account-holder-auth/filter/account-holder-auth-filter.tsx b/src/entities/additional-service/ui/account-holder-auth/filter/account-holder-auth-filter.tsx index e350c96..62bd3f1 100644 --- a/src/entities/additional-service/ui/account-holder-auth/filter/account-holder-auth-filter.tsx +++ b/src/entities/additional-service/ui/account-holder-auth/filter/account-holder-auth-filter.tsx @@ -9,6 +9,7 @@ import { authStatusBtnGroup } from '@/entities/additional-service/model/account- import { FilterMotionDuration, FilterMotionStyle, FilterMotionVariants } from '@/entities/common/model/constant'; import { useStore } from '@/shared/model/store'; import { AccountHolderAuthFilterProps, AccountHolderAuthStatus } from '@/entities/additional-service/model/account-holder-auth/types'; +import { FilterSelectMid } from '@/shared/ui/filter/select-mid'; export const AccountHolderAuthFilter = ({ filterOn, @@ -28,8 +29,6 @@ export const AccountHolderAuthFilter = ({ const [filterEndDate, setFilterEndDate] = useState(moment(endDate).format('YYYYMMDD')); const [filterAuthStatus, setFilterAuthStatus] = useState(authStatus); - const midOptions = useStore.getState().UserStore.selectOptionsMids; - const onClickToClose = () => { setFilterOn(false); }; @@ -51,9 +50,9 @@ export const AccountHolderAuthFilter = ({ className="full-menu-modal" initial="hidden" animate={(filterOn) ? 'visible' : 'hidden'} - variants={ FilterMotionVariants } - transition={ FilterMotionDuration } - style={ FilterMotionStyle } + variants={FilterMotionVariants} + transition={FilterMotionDuration} + style={FilterMotionStyle} >
@@ -73,12 +72,11 @@ export const AccountHolderAuthFilter = ({
- + selectSetter={setFilterMid} + showType={'GID'} + > (bank) const [filterResultStatus, setFilterResultStatus] = useState(resultStatus); - const midOptions = useStore.getState().UserStore.selectOptionsMids; const bankList = useStore.getState().CommonStore.bankList; const bankOptions = [ { name: '선택', value: '' }, @@ -94,12 +94,11 @@ export const AccountHolderSearchFilter = ({
- + showType={'GID'} + > (transType); const [filterAuthResult, setFilterAuthResult] = useState(authResult); - const midOptions = useStore.getState().UserStore.selectOptionsMids; - useEffect(() => { setFilterAuthResult(authResult); }, [authResult]); @@ -61,9 +60,9 @@ export const FaceAuthFilter = ({ className="full-menu-modal" initial="hidden" animate={(filterOn) ? 'visible' : 'hidden'} - variants={ FilterMotionVariants } - transition={ FilterMotionDuration } - style={ FilterMotionStyle } + variants={FilterMotionVariants} + transition={FilterMotionDuration} + style={FilterMotionStyle} >
@@ -83,12 +82,11 @@ export const FaceAuthFilter = ({
- + showType={'GID'} + > (sendType); const [filterSendCl, setFilterSendCl] = useState(sendCl); - const midOptions = useStore.getState().UserStore.selectOptionsMids; - // 결제수단에 따라 알림구분 버튼 그룹 선택 const alimClBtnGroup = useMemo(() => { if (filterServiceCode === ServiceCode.VBANK) { @@ -135,12 +134,11 @@ export const AlimtalkFilter = ({
- + showType={ 'GID' } + > (minAmount); const [filterMaxAmount, setFilterMaxAmount] = useState(maxAmount); - const midOptions = useStore.getState().UserStore.selectOptionsMids; - const onClickToClose = () => { setFilterOn(false); }; @@ -116,12 +115,11 @@ export const ArsFilter = ({
- + showType={ 'GID'} + > ({ name: bank.desc1, value: bank.code1 })) ]; - const midOptions = useStore.getState().UserStore.selectOptionsMids; - const onClickToClose = () => { setFilterOn(false); }; const onClickToSetFilter = () => { setMid(filterMid); - if(filterSearchCl === FundAccountSearchCl.ACCOUNT_NAME){ + if (filterSearchCl === FundAccountSearchCl.ACCOUNT_NAME) { setSearchCl(filterSearchCl); setSearchValue(filterSearchValue); } - else if(filterSearchCl === FundAccountSearchCl.ACCOUNT_NO){ + else if (filterSearchCl === FundAccountSearchCl.ACCOUNT_NO) { setSearchCl(filterSearchCl); - setSearchValue(filterSearchValue); + setSearchValue(filterSearchValue); } setSearchDateType(filterSearchDateType); setFromDate(filterFromDate); @@ -124,12 +123,11 @@ export const FundAccountResultFilter = ({
- + showType={'GID'} + > (moment(toDate).format('YYYYMMDD')); const [filterBankCode, setFilterBankCode] = useState(bankCode); const [filterStatus, setFilterStatus] = useState(status); - const midOptions = useStore.getState().UserStore.selectOptionsMids; - const bankList = useStore.getState().CommonStore.bankList; const bankOptions = [ { name: '선택', value: '' }, @@ -118,12 +117,11 @@ export const FundAccountTransactionFilter = ({
- + showType={ 'GID' } + > (status); const [filterMinAmount, setFilterMinAmount] = useState(minAmount); const [filterMaxAmount, setFilterMaxAmount] = useState(maxAmount); - - const midOptions = useStore.getState().UserStore.selectOptionsMids; const onClickToClose = () => { setFilterOn(false); @@ -90,68 +89,67 @@ export const PayoutFilter = ({ return ( <> -
필터
-
- + selectSetter={setFilterMid} + showType={'GID'} + >
-
diff --git a/src/entities/additional-service/ui/key-in-payment/filter/key-in-payment-filter.tsx b/src/entities/additional-service/ui/key-in-payment/filter/key-in-payment-filter.tsx index 25feff9..925d98e 100644 --- a/src/entities/additional-service/ui/key-in-payment/filter/key-in-payment-filter.tsx +++ b/src/entities/additional-service/ui/key-in-payment/filter/key-in-payment-filter.tsx @@ -10,6 +10,7 @@ import { FilterMotionDuration, FilterMotionStyle, FilterMotionVariants } from '@ import { useStore } from '@/shared/model/store'; import { KeyInPaymentFilterProps, KeyInPaymentTansactionType } from '@/entities/additional-service/model/key-in/types'; import { keyInPaymentPaymentStatusBtnGroup } from '@/entities/additional-service/model/key-in/constant'; +import { FilterSelectMid } from '@/shared/ui/filter/select-mid'; export const KeyInPaymentFilter = ({ filterOn, @@ -35,8 +36,6 @@ export const KeyInPaymentFilter = ({ const [filterMinAmount, setFilterMinAmount] = useState(minAmount); const [filterMaxAmount, setFilterMaxAmount] = useState(maxAmount); - const midOptions = useStore.getState().UserStore.selectOptionsMids; - const onClickToClose = () => { setFilterOn(false); }; @@ -57,9 +56,9 @@ export const KeyInPaymentFilter = ({ className="full-menu-modal" initial="hidden" animate={(filterOn) ? 'visible' : 'hidden'} - variants={ FilterMotionVariants } - transition={ FilterMotionDuration } - style={ FilterMotionStyle } + variants={FilterMotionVariants} + transition={FilterMotionDuration} + style={FilterMotionStyle} >
@@ -79,12 +78,11 @@ export const KeyInPaymentFilter = ({
- + showType={'GID'} + > (sendStatus); const [filterSendMethod, setFilterSendMethod] = useState(sendMethod); - const midOptions = useStore.getState().UserStore.selectOptionsMids; - let searchTypeOption = [ { name: '휴대폰번호', value: LinkPaymentSearchCl.PHONE }, { name: '이메일', value: LinkPaymentSearchCl.EMAIL }, @@ -122,12 +121,11 @@ export const LinkPaymentHistoryFilter = ({
- + showType={'GID'} + > (sendMethod) const [filterProcessStatus, setFilterProcessStatus] = useState(processStatus); - const midOptions = useStore.getState().UserStore.selectOptionsMids; - const onClickToClose = () => { setFilterOn(false); }; @@ -84,9 +83,9 @@ export const LinkPaymentWaitSendFilter = ({ className="full-menu-modal" initial="hidden" animate={(filterOn) ? 'visible' : 'hidden'} - variants={ FilterMotionVariants } - transition={ FilterMotionDuration } - style={ FilterMotionStyle } + variants={FilterMotionVariants} + transition={FilterMotionDuration} + style={FilterMotionStyle} >
@@ -106,12 +105,11 @@ export const LinkPaymentWaitSendFilter = ({
- + showType={'GID'} + > (moment(fromDate).format('YYYYMMDD')); const [filterToDate, setFilterToDate] = useState(moment(toDate).format('YYYYMMDD')); const [filterSmsCl, setFilterSmsCl] = useState(smsCl); - - const midOptions = useStore.getState().UserStore.selectOptionsMids; const onClickToSetFilter = () => { setMid(filterMid); @@ -72,9 +71,9 @@ export const SmsPaymentFilter = ({ className="full-menu-modal" initial="hidden" animate={(filterOn) ? 'visible' : 'hidden'} - variants={ FilterMotionVariants } - transition={ FilterMotionDuration } - style={ FilterMotionStyle } + variants={FilterMotionVariants} + transition={FilterMotionDuration} + style={FilterMotionStyle} >
@@ -94,12 +93,11 @@ export const SmsPaymentFilter = ({
- + selectSetter={setFilterMid} + showType={'GID'} + > { sortType ]); - if (!hasAccess) { - return ; - } + // if (!hasAccess) { + // return ; + // } return ( <> diff --git a/src/pages/additional-service/account-holder-search/account-holder-search-page.tsx b/src/pages/additional-service/account-holder-search/account-holder-search-page.tsx index d51f8b6..045c4e4 100644 --- a/src/pages/additional-service/account-holder-search/account-holder-search-page.tsx +++ b/src/pages/additional-service/account-holder-search/account-holder-search-page.tsx @@ -174,9 +174,9 @@ export const AccountHolderSearchPage = () => { sortType ]); - if (!hasAccess) { - return ; - } + // if (!hasAccess) { + // return ; + // } return ( <> diff --git a/src/pages/additional-service/alimtalk/list-page.tsx b/src/pages/additional-service/alimtalk/list-page.tsx index b0e9415..2474960 100644 --- a/src/pages/additional-service/alimtalk/list-page.tsx +++ b/src/pages/additional-service/alimtalk/list-page.tsx @@ -228,9 +228,9 @@ export const AlimtalkListPage = () => { sendCl ]); - if (!hasAccess) { - return ; - } + // if (!hasAccess) { + // return ; + // } return ( <> diff --git a/src/pages/additional-service/ars/detail-page.tsx b/src/pages/additional-service/ars/detail-page.tsx index f057969..c5b8e73 100644 --- a/src/pages/additional-service/ars/detail-page.tsx +++ b/src/pages/additional-service/ars/detail-page.tsx @@ -86,7 +86,7 @@ export const ArsDetailPage = () => {
- {t('home.money', { value: new Intl.NumberFormat('en-US').format(detail?.amount || 0) })} + {t('home.money', { value: new Intl.NumberFormat('en-US').format(Number(detail?.amount) || 0) })}
{ detail?.corpName }
diff --git a/src/pages/additional-service/fund-account/transfer-list-page.tsx b/src/pages/additional-service/fund-account/transfer-list-page.tsx index e523a8d..59b9901 100644 --- a/src/pages/additional-service/fund-account/transfer-list-page.tsx +++ b/src/pages/additional-service/fund-account/transfer-list-page.tsx @@ -28,9 +28,9 @@ export const FundAccountTransferListPage = () => { navigate(PATHS.home); }); - if (!hasAccess) { - return ; - } + // if (!hasAccess) { + // return ; + // } return ( <> diff --git a/src/pages/additional-service/link-payment/link-payment-history-page.tsx b/src/pages/additional-service/link-payment/link-payment-history-page.tsx index 53d8652..0343901 100644 --- a/src/pages/additional-service/link-payment/link-payment-history-page.tsx +++ b/src/pages/additional-service/link-payment/link-payment-history-page.tsx @@ -35,9 +35,9 @@ export const LinkPaymentHistoryPage = () => { navigate(PATHS.home); }); - if(!hasAccess){ - return ; - } + // if(!hasAccess){ + // return ; + // } return ( <> diff --git a/src/pages/additional-service/list-page.tsx b/src/pages/additional-service/list-page.tsx index b6feccc..638dcf5 100644 --- a/src/pages/additional-service/list-page.tsx +++ b/src/pages/additional-service/list-page.tsx @@ -13,12 +13,14 @@ import { useExtensionListMutation } from '@/entities/additional-service/api/use- import { ExtensionListParams, ExtensionListResponse, SERVICE_MAP } from '@/entities/additional-service/model/types'; import { useStore } from '@/shared/model/store'; import { Dialog } from '@/shared/ui/dialogs/dialog'; +import { FilterSelectMid } from '@/shared/ui/filter/select-mid'; export const ListPage = () => { const { t } = useTranslation(); const { navigate } = useNavigate(); const midOptions = useStore.getState().UserStore.selectOptionsMids; const userMid = useStore.getState().UserStore.mid; + const midOptionsWithoutGids = useStore.getState().UserStore.selectOptionsMidsWithoutGids; const [mid, setMid] = useState(userMid); const [activeServices, setActiveServices] = useState([]); @@ -44,6 +46,24 @@ export const ListPage = () => { }); }; + const getSelectMidOptions = () => { + let rs = []; + let options = midOptionsWithoutGids; + for (let i = 0; i < options.length; i++) { + rs.push( + + ); + } + return rs; + }; + + const onChangeMidSelect = (val: string) => { + setMid(val); + }; + const getActiveExtensionList = () => { const filteredServices = SERVICE_MAP.filter(service => activeServices.includes(service.code) @@ -104,16 +124,12 @@ export const ListPage = () => {
diff --git a/src/pages/additional-service/payout/list-page.tsx b/src/pages/additional-service/payout/list-page.tsx index 97e42c6..7319e06 100644 --- a/src/pages/additional-service/payout/list-page.tsx +++ b/src/pages/additional-service/payout/list-page.tsx @@ -222,9 +222,9 @@ export const PayoutListPage = () => { return rs; }; - if (!hasAccess) { - return ; - } + // if (!hasAccess) { + // return ; + // } return ( <> diff --git a/src/shared/ui/filter/select-mid.tsx b/src/shared/ui/filter/select-mid.tsx index 2d7d500..091c0fa 100644 --- a/src/shared/ui/filter/select-mid.tsx +++ b/src/shared/ui/filter/select-mid.tsx @@ -35,8 +35,8 @@ export const FilterSelectMid = ({ rs.push( + value={ options[i]?.value } + >{ options[i]?.name } ); } return rs;