diff --git a/src/entities/merchant/ui/section/manager-section.tsx b/src/entities/merchant/ui/section/manager-section.tsx index d85d5ad..47a3833 100644 --- a/src/entities/merchant/ui/section/manager-section.tsx +++ b/src/entities/merchant/ui/section/manager-section.tsx @@ -39,7 +39,7 @@ export const ManagerSection = ({ useEffect(() => { if(!!openChild && openChild !== type){ - setIsOpen(false); + setIsOpen(false); } }, [openChild]); diff --git a/src/entities/transaction/ui/detail/all-transaction-detail.tsx b/src/entities/transaction/ui/detail/all-transaction-detail.tsx index 38065b5..6f71696 100644 --- a/src/entities/transaction/ui/detail/all-transaction-detail.tsx +++ b/src/entities/transaction/ui/detail/all-transaction-detail.tsx @@ -133,15 +133,35 @@ export const AllTransactionDetail = ({ } else if(infoSectionKey === InfoSectionKeys.Payment){ setShowPaymentInfo(!showPaymentInfo); + if(!showPaymentInfo){ + setShowTransactionInfo(false); + setShowSettlementInfo(false); + setShowPartCancelInfo(false); + } } else if(infoSectionKey === InfoSectionKeys.Transaction){ setShowTransactionInfo(!showTransactionInfo); + if(!showTransactionInfo){ + setShowPaymentInfo(false); + setShowSettlementInfo(false); + setShowPartCancelInfo(false); + } } else if(infoSectionKey === InfoSectionKeys.Settlement){ setShowSettlementInfo(!showSettlementInfo); + if(!showSettlementInfo){ + setShowPaymentInfo(false); + setShowTransactionInfo(false); + setShowPartCancelInfo(false); + } } else if(infoSectionKey === InfoSectionKeys.PartCancel){ setShowPartCancelInfo(!showPartCancelInfo); + if(!showPartCancelInfo){ + setShowPaymentInfo(false); + setShowTransactionInfo(false); + setShowSettlementInfo(false); + } } }; diff --git a/src/entities/transaction/ui/detail/cash-receit-detail.tsx b/src/entities/transaction/ui/detail/cash-receit-detail.tsx index 6d8784c..5caab1b 100644 --- a/src/entities/transaction/ui/detail/cash-receit-detail.tsx +++ b/src/entities/transaction/ui/detail/cash-receit-detail.tsx @@ -109,9 +109,15 @@ export const CashReceiptDetail = ({ const onClickToOpenInfo = (infoSectionKey: InfoSectionKeys) => { if(infoSectionKey === InfoSectionKeys.Amount){ setShowAmountInfo(!showAmountInfo); + if(!showAmountInfo){ + setShowDetailInfo(false); + } } else if(infoSectionKey === InfoSectionKeys.Detail){ setShowDetailInfo(!showDetailInfo); + if(!showDetailInfo){ + setShowAmountInfo(false); + } } }; diff --git a/src/entities/transaction/ui/detail/escrow-detail.tsx b/src/entities/transaction/ui/detail/escrow-detail.tsx index f9e327f..1f10c86 100644 --- a/src/entities/transaction/ui/detail/escrow-detail.tsx +++ b/src/entities/transaction/ui/detail/escrow-detail.tsx @@ -136,23 +136,55 @@ export const EscrowDetail = ({ if(infoSectionKey === InfoSectionKeys.Amount){ setShowAmountInfo(!showAmountInfo); } - else if(infoSectionKey === InfoSectionKeys.Important){ - setShowImportantInfo(!showImportantInfo); - } else if(infoSectionKey === InfoSectionKeys.Escrow){ setShowEscroInfo(!showEscroInfo); + if(!showEscroInfo){ + setShowImportantInfo(false); + setShowPaymentInfo(false); + setShowTransactionInfo(false); + setShowSettlementInfo(false); + setShowMerchantInfo(false); + } } else if(infoSectionKey === InfoSectionKeys.Payment){ setShowPaymentInfo(!showPaymentInfo); + if(!showPaymentInfo){ + setShowImportantInfo(false); + setShowEscroInfo(false); + setShowTransactionInfo(false); + setShowSettlementInfo(false); + setShowMerchantInfo(false); + } } else if(infoSectionKey === InfoSectionKeys.Transaction){ setShowTransactionInfo(!showTransactionInfo); + if(!showTransactionInfo){ + setShowImportantInfo(false); + setShowEscroInfo(false); + setShowPaymentInfo(false); + setShowSettlementInfo(false); + setShowMerchantInfo(false); + } } else if(infoSectionKey === InfoSectionKeys.Settlement){ setShowSettlementInfo(!showSettlementInfo); + if(!showSettlementInfo){ + setShowImportantInfo(false); + setShowEscroInfo(false); + setShowPaymentInfo(false); + setShowTransactionInfo(false); + setShowMerchantInfo(false); + } } else if(infoSectionKey === InfoSectionKeys.Merchant){ setShowMerchantInfo(!showMerchantInfo); + if(!showMerchantInfo){ + setShowImportantInfo(false); + setShowEscroInfo(false); + setShowPaymentInfo(false); + setShowTransactionInfo(false); + setShowSettlementInfo(false); + } } };