From cec1317f75c9dfbc1051c7dbc4e2b2ef9aceac87 Mon Sep 17 00:00:00 2001
From: tay suisin <suisin@regentmarkets.com>
Date: Mon, 8 Aug 2022 16:20:17 +0800
Subject: [PATCH 1/8] Updated Sign up Modal Message

---
 .../App/Containers/AccountSignupModal/account-signup-modal.jsx | 1 +
 .../App/Containers/CitizenshipModal/same-citizenship-modal.jsx | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/core/src/App/Containers/AccountSignupModal/account-signup-modal.jsx b/packages/core/src/App/Containers/AccountSignupModal/account-signup-modal.jsx
index 281633677de5..e09da8269b4e 100644
--- a/packages/core/src/App/Containers/AccountSignupModal/account-signup-modal.jsx
+++ b/packages/core/src/App/Containers/AccountSignupModal/account-signup-modal.jsx
@@ -135,6 +135,7 @@ const AccountSignup = ({ enableApp, isModalVisible, clients_country, onSignup, r
                                             setIsCitizenshipModal={setIsCitizenshipModal}
                                             setIsPasswordModal={setIsPasswordModal}
                                             setIsSameCitizenshipModal={setIsSameCitizenshipModal}
+                                            selectedCountry={selected_residence}
                                         />
                                     ) : (
                                         <>
diff --git a/packages/core/src/App/Containers/CitizenshipModal/same-citizenship-modal.jsx b/packages/core/src/App/Containers/CitizenshipModal/same-citizenship-modal.jsx
index ba39b340d9b1..6e3c852f060f 100644
--- a/packages/core/src/App/Containers/CitizenshipModal/same-citizenship-modal.jsx
+++ b/packages/core/src/App/Containers/CitizenshipModal/same-citizenship-modal.jsx
@@ -9,10 +9,11 @@ const SameCitizenshipModal = ({
     setIsCitizenshipModal,
     setIsPasswordModal,
     setIsSameCitizenshipModal,
+    selectedCountry,
 }) => (
     <div>
         <Text as='p' className='account-signup__text'>
-            {localize('Are you a citizen of the same country where you live?')}
+            {localize('Are you a citizen of ')} {selectedCountry}?
         </Text>
         <div className='account-signup__same-citizenship'>
             <Button

From 4f87fef70d22ee50428074668675af8f2cfea961 Mon Sep 17 00:00:00 2001
From: tay suisin <suisin@regentmarkets.com>
Date: Mon, 8 Aug 2022 18:02:56 +0800
Subject: [PATCH 2/8] Updated Localize Value

---
 .../App/Containers/CitizenshipModal/same-citizenship-modal.jsx | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/core/src/App/Containers/CitizenshipModal/same-citizenship-modal.jsx b/packages/core/src/App/Containers/CitizenshipModal/same-citizenship-modal.jsx
index 6e3c852f060f..d189b906d3b8 100644
--- a/packages/core/src/App/Containers/CitizenshipModal/same-citizenship-modal.jsx
+++ b/packages/core/src/App/Containers/CitizenshipModal/same-citizenship-modal.jsx
@@ -9,11 +9,10 @@ const SameCitizenshipModal = ({
     setIsCitizenshipModal,
     setIsPasswordModal,
     setIsSameCitizenshipModal,
-    selectedCountry,
 }) => (
     <div>
         <Text as='p' className='account-signup__text'>
-            {localize('Are you a citizen of ')} {selectedCountry}?
+            {localize('Are you a citizen of {{residence}}?', { residence })}
         </Text>
         <div className='account-signup__same-citizenship'>
             <Button

From 5967116e271efa226327911a801ecebc1c844de7 Mon Sep 17 00:00:00 2001
From: tay suisin <suisin@regentmarkets.com>
Date: Tue, 9 Aug 2022 10:49:17 +0800
Subject: [PATCH 3/8] Remove selectedCountry

---
 .../App/Containers/AccountSignupModal/account-signup-modal.jsx   | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/core/src/App/Containers/AccountSignupModal/account-signup-modal.jsx b/packages/core/src/App/Containers/AccountSignupModal/account-signup-modal.jsx
index e09da8269b4e..281633677de5 100644
--- a/packages/core/src/App/Containers/AccountSignupModal/account-signup-modal.jsx
+++ b/packages/core/src/App/Containers/AccountSignupModal/account-signup-modal.jsx
@@ -135,7 +135,6 @@ const AccountSignup = ({ enableApp, isModalVisible, clients_country, onSignup, r
                                             setIsCitizenshipModal={setIsCitizenshipModal}
                                             setIsPasswordModal={setIsPasswordModal}
                                             setIsSameCitizenshipModal={setIsSameCitizenshipModal}
-                                            selectedCountry={selected_residence}
                                         />
                                     ) : (
                                         <>

From 93067f6d938e3a27c57a0bec126cce5e78126f03 Mon Sep 17 00:00:00 2001
From: tay suisin <suisin@regentmarkets.com>
Date: Wed, 10 Aug 2022 15:59:13 +0800
Subject: [PATCH 4/8] resolved characters issue

---
 .../App/Containers/CitizenshipModal/same-citizenship-modal.jsx  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/core/src/App/Containers/CitizenshipModal/same-citizenship-modal.jsx b/packages/core/src/App/Containers/CitizenshipModal/same-citizenship-modal.jsx
index d189b906d3b8..fc9d750c7389 100644
--- a/packages/core/src/App/Containers/CitizenshipModal/same-citizenship-modal.jsx
+++ b/packages/core/src/App/Containers/CitizenshipModal/same-citizenship-modal.jsx
@@ -12,7 +12,7 @@ const SameCitizenshipModal = ({
 }) => (
     <div>
         <Text as='p' className='account-signup__text'>
-            {localize('Are you a citizen of {{residence}}?', { residence })}
+            {localize('Are you a citizen of {{- residence}}?', { residence })}
         </Text>
         <div className='account-signup__same-citizenship'>
             <Button

From b91f4b7320b25bd701c5039be1e8a502eb44265b Mon Sep 17 00:00:00 2001
From: tay suisin <suisin@regentmarkets.com>
Date: Thu, 11 Aug 2022 11:36:24 +0800
Subject: [PATCH 5/8] Make Choose Country empty

---
 .../App/Containers/CitizenshipModal/same-citizenship-modal.jsx   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/core/src/App/Containers/CitizenshipModal/same-citizenship-modal.jsx b/packages/core/src/App/Containers/CitizenshipModal/same-citizenship-modal.jsx
index fc9d750c7389..91be760a6e31 100644
--- a/packages/core/src/App/Containers/CitizenshipModal/same-citizenship-modal.jsx
+++ b/packages/core/src/App/Containers/CitizenshipModal/same-citizenship-modal.jsx
@@ -18,6 +18,7 @@ const SameCitizenshipModal = ({
             <Button
                 type='button'
                 onClick={() => {
+                    setFieldValue('residence', null, false);
                     setIsSameCitizenshipModal(false);
                 }}
                 tertiary

From a68f3a2e8afe5c1df21414e7df7d56c4048f5e56 Mon Sep 17 00:00:00 2001
From: tay suisin <suisin@regentmarkets.com>
Date: Mon, 15 Aug 2022 14:07:24 +0800
Subject: [PATCH 6/8] Fixed Highlight Issue

---
 .../src/components/autocomplete/autocomplete.jsx      | 11 +++++++++++
 .../AccountSignupModal/account-signup-modal.jsx       |  3 +++
 .../CitizenshipModal/same-citizenship-modal.jsx       |  1 -
 .../SetResidenceModal/set-residence-form.jsx          |  3 +++
 4 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/packages/components/src/components/autocomplete/autocomplete.jsx b/packages/components/src/components/autocomplete/autocomplete.jsx
index 20cb84a14885..5216fece9804 100644
--- a/packages/components/src/components/autocomplete/autocomplete.jsx
+++ b/packages/components/src/components/autocomplete/autocomplete.jsx
@@ -33,6 +33,7 @@ const Autocomplete = React.memo(props => {
         autoComplete,
         className,
         dropdown_offset,
+        historyValue,
         error,
         has_updating_list = true,
         input_id,
@@ -70,6 +71,16 @@ const Autocomplete = React.memo(props => {
         }
     }, [list_items, has_updating_list]);
 
+    React.useEffect(() => {
+        if (historyValue) {
+            const index = filtered_items.findIndex(object => {
+                return object.text === historyValue;
+            });
+            setInputValue(historyValue);
+            setActiveIndex(index);
+        }
+    }, [historyValue]);
+
     React.useEffect(() => {
         if (should_show_list && list_item_ref.current) {
             const item = list_item_ref.current.offsetTop;
diff --git a/packages/core/src/App/Containers/AccountSignupModal/account-signup-modal.jsx b/packages/core/src/App/Containers/AccountSignupModal/account-signup-modal.jsx
index 281633677de5..76bc74e41dcb 100644
--- a/packages/core/src/App/Containers/AccountSignupModal/account-signup-modal.jsx
+++ b/packages/core/src/App/Containers/AccountSignupModal/account-signup-modal.jsx
@@ -20,6 +20,7 @@ const AccountSignup = ({ enableApp, isModalVisible, clients_country, onSignup, r
     const [api_error, setApiError] = React.useState(false);
     const [is_loading, setIsLoading] = React.useState(true);
     const [country, setCountry] = React.useState('');
+    const history_value = React.useRef();
     const [pw_input, setPWInput] = React.useState('');
     const [selected_residence, setSelectedResidence] = React.useState('');
     const [selected_citizenship, setSelectedCitizenship] = React.useState('');
@@ -110,6 +111,7 @@ const AccountSignup = ({ enableApp, isModalVisible, clients_country, onSignup, r
                                     setFieldValue={setFieldValue}
                                     residence_list={residence_list}
                                     default_value={country}
+                                    history_value={history_value.current}
                                 >
                                     <Button
                                         className={classNames('account-signup__btn', {
@@ -119,6 +121,7 @@ const AccountSignup = ({ enableApp, isModalVisible, clients_country, onSignup, r
                                         is_disabled={!values.residence || !!errors.residence}
                                         onClick={() => {
                                             onResidenceSelection(values.residence);
+                                            history_value.current = values.residence;
                                         }}
                                         primary
                                         large
diff --git a/packages/core/src/App/Containers/CitizenshipModal/same-citizenship-modal.jsx b/packages/core/src/App/Containers/CitizenshipModal/same-citizenship-modal.jsx
index 91be760a6e31..fc9d750c7389 100644
--- a/packages/core/src/App/Containers/CitizenshipModal/same-citizenship-modal.jsx
+++ b/packages/core/src/App/Containers/CitizenshipModal/same-citizenship-modal.jsx
@@ -18,7 +18,6 @@ const SameCitizenshipModal = ({
             <Button
                 type='button'
                 onClick={() => {
-                    setFieldValue('residence', null, false);
                     setIsSameCitizenshipModal(false);
                 }}
                 tertiary
diff --git a/packages/core/src/App/Containers/SetResidenceModal/set-residence-form.jsx b/packages/core/src/App/Containers/SetResidenceModal/set-residence-form.jsx
index 277b8d4776a7..9147fc404922 100644
--- a/packages/core/src/App/Containers/SetResidenceModal/set-residence-form.jsx
+++ b/packages/core/src/App/Containers/SetResidenceModal/set-residence-form.jsx
@@ -8,6 +8,7 @@ const SetResidenceForm = ({
     class_prefix = 'set-residence',
     children,
     default_value,
+    history_value,
     header_text,
     errors,
     touched,
@@ -42,6 +43,7 @@ const SetResidenceForm = ({
                                 className={`${class_prefix}__residence-field`}
                                 type='text'
                                 label={localize('Choose country')}
+                                historyValue={history_value}
                                 error={touched.residence && errors.residence}
                                 required
                                 list_items={residence_list}
@@ -77,6 +79,7 @@ SetResidenceForm.propTypes = {
     children: PropTypes.node,
     class_prefix: PropTypes.string,
     default_value: PropTypes.string,
+    history_value: PropTypes.string,
     errors: PropTypes.object,
     header_text: PropTypes.string,
     residence_list: PropTypes.arrayOf(PropTypes.object),

From c7ed2ae9aee864866844ff977c6925304b4f3433 Mon Sep 17 00:00:00 2001
From: tay suisin <suisin@regentmarkets.com>
Date: Mon, 15 Aug 2022 16:17:25 +0800
Subject: [PATCH 7/8] Update highlight selection functions

---
 .../components/autocomplete/autocomplete.jsx  | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/packages/components/src/components/autocomplete/autocomplete.jsx b/packages/components/src/components/autocomplete/autocomplete.jsx
index 5216fece9804..d79797d8c5e2 100644
--- a/packages/components/src/components/autocomplete/autocomplete.jsx
+++ b/packages/components/src/components/autocomplete/autocomplete.jsx
@@ -68,18 +68,15 @@ const Autocomplete = React.memo(props => {
             setFilteredItems(list_items);
             setActiveIndex(null);
             setInputValue('');
+            if (historyValue) {
+                const index = filtered_items.findIndex(object => {
+                    return object.text === historyValue;
+                });
+                setInputValue(historyValue);
+                setActiveIndex(index);
+            }
         }
-    }, [list_items, has_updating_list]);
-
-    React.useEffect(() => {
-        if (historyValue) {
-            const index = filtered_items.findIndex(object => {
-                return object.text === historyValue;
-            });
-            setInputValue(historyValue);
-            setActiveIndex(index);
-        }
-    }, [historyValue]);
+    }, [list_items, has_updating_list, historyValue]);
 
     React.useEffect(() => {
         if (should_show_list && list_item_ref.current) {

From f8cfcf0548b8706b4643b395cff47211a7a92d3d Mon Sep 17 00:00:00 2001
From: tay suisin <suisin@regentmarkets.com>
Date: Mon, 15 Aug 2022 17:07:23 +0800
Subject: [PATCH 8/8] Update function

---
 .../components/src/components/autocomplete/autocomplete.jsx  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/components/src/components/autocomplete/autocomplete.jsx b/packages/components/src/components/autocomplete/autocomplete.jsx
index d79797d8c5e2..fca0278f29c2 100644
--- a/packages/components/src/components/autocomplete/autocomplete.jsx
+++ b/packages/components/src/components/autocomplete/autocomplete.jsx
@@ -66,14 +66,15 @@ const Autocomplete = React.memo(props => {
     React.useEffect(() => {
         if (has_updating_list) {
             setFilteredItems(list_items);
-            setActiveIndex(null);
-            setInputValue('');
             if (historyValue) {
                 const index = filtered_items.findIndex(object => {
                     return object.text === historyValue;
                 });
                 setInputValue(historyValue);
                 setActiveIndex(index);
+            } else {
+                setInputValue('');
+                setActiveIndex(null);
             }
         }
     }, [list_items, has_updating_list, historyValue]);