From c51fd1bd4c311f94b6d22fad2a392be7b980fd6a Mon Sep 17 00:00:00 2001
From: Quangnhankie <nhantran@kie.io>
Date: Thu, 7 Oct 2021 11:01:41 +0700
Subject: [PATCH] bug: fix bug select common

---
 src/components/common/SelectCommon/SelectCommon.tsx        | 7 +++++--
 .../hooks/{user => account}/useEditCustomerAddress.tsx     | 0
 src/components/hooks/{user => account}/useEditUserInfo.tsx | 0
 src/components/hooks/index.ts                              | 4 ++--
 4 files changed, 7 insertions(+), 4 deletions(-)
 rename src/components/hooks/{user => account}/useEditCustomerAddress.tsx (100%)
 rename src/components/hooks/{user => account}/useEditUserInfo.tsx (100%)

diff --git a/src/components/common/SelectCommon/SelectCommon.tsx b/src/components/common/SelectCommon/SelectCommon.tsx
index 122d9a78d..6e24a7020 100644
--- a/src/components/common/SelectCommon/SelectCommon.tsx
+++ b/src/components/common/SelectCommon/SelectCommon.tsx
@@ -19,9 +19,12 @@ const SelectCommon = ({selected,initValue, type = 'default', size = 'base', opti
     const [selectedValue, setSelectedValue] = useState('')
 
     useEffect(()=>{
-        setSelectedValue(selected ?? '');
+        const nameSelect = option.find((val)=>val.value === selected);
+        setSelectedName(nameSelect?.name);
         setSelectedValue(initValue ?? '');
-    })
+        onChange && onChange(initValue ?? '');
+    },[])
+
     const changeSelectedName = (item:string, value: string) => {
         setSelectedValue(value)
         setSelectedName(item)
diff --git a/src/components/hooks/user/useEditCustomerAddress.tsx b/src/components/hooks/account/useEditCustomerAddress.tsx
similarity index 100%
rename from src/components/hooks/user/useEditCustomerAddress.tsx
rename to src/components/hooks/account/useEditCustomerAddress.tsx
diff --git a/src/components/hooks/user/useEditUserInfo.tsx b/src/components/hooks/account/useEditUserInfo.tsx
similarity index 100%
rename from src/components/hooks/user/useEditUserInfo.tsx
rename to src/components/hooks/account/useEditUserInfo.tsx
diff --git a/src/components/hooks/index.ts b/src/components/hooks/index.ts
index f2775d5bb..d01d505ea 100644
--- a/src/components/hooks/index.ts
+++ b/src/components/hooks/index.ts
@@ -1,4 +1,4 @@
 export { default as useModalCommon } from './useModalCommon'
-export { default as useEditUserInfo } from './user/useEditUserInfo'
-export { default as useEditCustomerAddress } from './user/useEditCustomerAddress'
+export { default as useEditUserInfo } from './account/useEditUserInfo'
+export { default as useEditCustomerAddress } from './account/useEditCustomerAddress'