From a89566adc17bb651dfd3fa5aa3bd6fda5df25dca Mon Sep 17 00:00:00 2001
From: caturbgs <savemeplease11>
Date: Wed, 22 Dec 2021 11:01:48 +0700
Subject: [PATCH] fix: change category not default select sub categories

---
 src/pages/Transaction/Product.js     | 13 +++++--------
 src/pages/Transaction/Transaction.js |  3 ++-
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/pages/Transaction/Product.js b/src/pages/Transaction/Product.js
index 1bc7a67..b2c59b2 100644
--- a/src/pages/Transaction/Product.js
+++ b/src/pages/Transaction/Product.js
@@ -69,14 +69,11 @@ export const Product = observer(() => {
       <Row>
         <Col span={24}>
           <Select
-            placeholder={"Select Sub Category"}
-            allowClear={true}
-            onChange={(val) => {
-              if (val) {
-                handleChangeSubcategory(val);
-              }
-            }}
-            style={{marginBottom: "10px", width: "100%"}}
+              placeholder={"Select Sub Category"}
+              allowClear={true}
+              onChange={(val) => handleChangeSubcategory(val)}
+              style={{marginBottom: "10px", width: "100%"}}
+              value={store.transaction.filterSubCategory}
           >
             {store.transaction.dataSubCategories.map((item, index) => (
               <Option key={item.id} value={item.id}>
diff --git a/src/pages/Transaction/Transaction.js b/src/pages/Transaction/Transaction.js
index 03fa712..4d7a9cc 100644
--- a/src/pages/Transaction/Transaction.js
+++ b/src/pages/Transaction/Transaction.js
@@ -34,9 +34,10 @@ export const Transaction = observer(() => {
   }, []);
 
   const handleChangeTabs = async (key) => {
+    modalLoader.setLoading(true);
     store.transaction.dataSubCategories = [];
     store.transaction.data = [];
-    modalLoader.setLoading(true);
+    store.transaction.filterSubCategory = null;
     store.transaction.filterCategory = key;
     await store.transaction.getDataSubCategories();
     modalLoader.setLoading(false);