diff --git a/src/entities/transaction/ui/list-item.tsx b/src/entities/transaction/ui/list-item.tsx index 700c846..40fa834 100644 --- a/src/entities/transaction/ui/list-item.tsx +++ b/src/entities/transaction/ui/list-item.tsx @@ -219,11 +219,11 @@ export const ListItem = ({ > { getTime() } | - { getTransactionTypeName(t)(transactionType) } + { processResult } | { getPaymentMethodName(t, paymentMethod) } | - { processResult } + { getTransactionTypeName(t)(transactionType) } ); } diff --git a/src/entities/transaction/ui/section/all-transaction-cancel-section-bank-group.tsx b/src/entities/transaction/ui/section/all-transaction-cancel-section-bank-group.tsx index cf1e5c6..d25cdf0 100644 --- a/src/entities/transaction/ui/section/all-transaction-cancel-section-bank-group.tsx +++ b/src/entities/transaction/ui/section/all-transaction-cancel-section-bank-group.tsx @@ -1,6 +1,7 @@ import { useTranslation } from 'react-i18next'; import { useStore } from "@/shared/model/store"; -import { ChangeEvent, useState } from "react"; +import { ChangeEvent, useEffect, useState } from "react"; +import { PatternFormat } from 'react-number-format'; export interface AllTransactionCancelSectionBankGroupProps { bankCode?: string; @@ -36,6 +37,19 @@ export const AllTransactionCancelSectionBankGroup = ({ setNewAccountHolder(value); }; + useEffect(() => { + if(setBankCode && newBankCode){ + setBankCode(newBankCode); + } + if(setAccountNo && newAccountNo){ + setAccountNo(newAccountNo); + } + if(setAccountHolder && newAccountHolder){ + setAccountHolder(newAccountHolder); + } + + }, [newBankCode, newAccountNo, newAccountHolder]) + return ( <>