From 5ce11f192f505873907d8d1f7f90db80c3dfe119 Mon Sep 17 00:00:00 2001
From: Ahmed Bouhuolia <a.bouhuolia@gmail.com>
Date: Thu, 1 Aug 2024 14:02:02 +0200
Subject: [PATCH] feat: reset the state once closing categorization aside

---
 .../AccountTransactionsActionsBar.tsx         | 31 +++++++++++--------
 .../CategorizeTransactionAside.tsx            | 17 ++++++++--
 2 files changed, 33 insertions(+), 15 deletions(-)

diff --git a/packages/webapp/src/containers/CashFlow/AccountTransactions/AccountTransactionsActionsBar.tsx b/packages/webapp/src/containers/CashFlow/AccountTransactions/AccountTransactionsActionsBar.tsx
index 13160984b..75557be81 100644
--- a/packages/webapp/src/containers/CashFlow/AccountTransactions/AccountTransactionsActionsBar.tsx
+++ b/packages/webapp/src/containers/CashFlow/AccountTransactions/AccountTransactionsActionsBar.tsx
@@ -62,6 +62,7 @@ function AccountTransactionsActionsBar({
   // #withBanking
   uncategorizedTransationsIdsSelected,
   excludedTransactionsIdsSelected,
+  openMatchingTransactionAside,
 
   // #withBankingActions
   enableMultipleCategorization,
@@ -284,19 +285,21 @@ function AccountTransactionsActionsBar({
       </NavbarGroup>
 
       <NavbarGroup align={Alignment.RIGHT}>
-        <Tooltip
-          content={
-            'Enables to categorize or matching multiple bank transactions into one transaction.'
-          }
-          position={Position.BOTTOM}
-          minimal
-        >
-          <Switch
-            label={'Multi Select'}
-            inline
-            onChange={handleMultipleCategorizingSwitch}
-          />
-        </Tooltip>
+        {openMatchingTransactionAside && (
+          <Tooltip
+            content={
+              'Enables to categorize or matching multiple bank transactions into one transaction.'
+            }
+            position={Position.BOTTOM}
+            minimal
+          >
+            <Switch
+              label={'Multi Select'}
+              inline
+              onChange={handleMultipleCategorizingSwitch}
+            />
+          </Tooltip>
+        )}
         <NavbarDivider />
         <Popover
           minimal={true}
@@ -342,9 +345,11 @@ export default compose(
     ({
       uncategorizedTransationsIdsSelected,
       excludedTransactionsIdsSelected,
+      openMatchingTransactionAside,
     }) => ({
       uncategorizedTransationsIdsSelected,
       excludedTransactionsIdsSelected,
+      openMatchingTransactionAside,
     }),
   ),
   withBankingActions,
diff --git a/packages/webapp/src/containers/CashFlow/CategorizeTransactionAside/CategorizeTransactionAside.tsx b/packages/webapp/src/containers/CashFlow/CategorizeTransactionAside/CategorizeTransactionAside.tsx
index bc228471d..9945ffe04 100644
--- a/packages/webapp/src/containers/CashFlow/CategorizeTransactionAside/CategorizeTransactionAside.tsx
+++ b/packages/webapp/src/containers/CashFlow/CategorizeTransactionAside/CategorizeTransactionAside.tsx
@@ -19,13 +19,26 @@ function CategorizeTransactionAsideRoot({
 
   // #withBanking
   selectedUncategorizedTransactionId,
+  resetTransactionsToCategorizeSelected,
+  enableMultipleCategorization,
 }: CategorizeTransactionAsideProps) {
-  // 
+  //
   useEffect(
     () => () => {
+      // Close the reconcile matching form.
       closeReconcileMatchingTransaction();
+
+      // Reset the selected transactions to categorize.
+      resetTransactionsToCategorizeSelected();
+
+      // Disable multi matching.
+      enableMultipleCategorization(false);
     },
-    [closeReconcileMatchingTransaction],
+    [
+      closeReconcileMatchingTransaction,
+      resetTransactionsToCategorizeSelected,
+      enableMultipleCategorization,
+    ],
   );
 
   const handleClose = () => {