From 96327027c2ae0eb6214794138a715f974b1594aa Mon Sep 17 00:00:00 2001
From: gets0ul <gets0ul@gmail.com>
Date: Sat, 26 Jun 2021 21:53:27 +0700
Subject: [PATCH 1/2] fix: member country is not displayed in settings

use homeCountryCode or competitionCountryCode as displayed country in member settings page when country is not found in the basic_info traits
---
 src/shared/components/Settings/Profile/BasicInfo/index.jsx | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/shared/components/Settings/Profile/BasicInfo/index.jsx b/src/shared/components/Settings/Profile/BasicInfo/index.jsx
index e1379030dc..89099d58f5 100644
--- a/src/shared/components/Settings/Profile/BasicInfo/index.jsx
+++ b/src/shared/components/Settings/Profile/BasicInfo/index.jsx
@@ -455,6 +455,8 @@ export default class BasicInfo extends ConsentComponent {
       key: country.countryCode,
       name: country.country,
     }));
+    const countryCode = newBasicInfo.homeCountryCode || newBasicInfo.competitionCountryCode;
+    const currentCountry = newBasicInfo.country || countries.find(c => c.key === countryCode);
 
     return (
       <div styleName="basic-info-container">
@@ -591,7 +593,7 @@ export default class BasicInfo extends ConsentComponent {
                 <Select
                   name="country"
                   options={countries}
-                  value={newBasicInfo.country}
+                  value={currentCountry}
                   onChange={this.onUpdateCountry}
                   placeholder="Country"
                   matchPos="start"
@@ -801,7 +803,7 @@ export default class BasicInfo extends ConsentComponent {
                   <Select
                     name="countryId"
                     options={countries}
-                    value={newBasicInfo.country}
+                    value={currentCountry}
                     onChange={this.onUpdateCountry}
                     placeholder="Country"
                     matchPos="start"

From 753a4b54437792f011a67839bd78439d949a2dcd Mon Sep 17 00:00:00 2001
From: gets0ul <gets0ul@gmail.com>
Date: Tue, 29 Jun 2021 14:11:03 +0700
Subject: [PATCH 2/2] fix: update code

update state when list of all countries for mapping has been received from back end.
---
 .../Settings/Profile/BasicInfo/index.jsx         | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/shared/components/Settings/Profile/BasicInfo/index.jsx b/src/shared/components/Settings/Profile/BasicInfo/index.jsx
index 89099d58f5..aa7e8c9711 100644
--- a/src/shared/components/Settings/Profile/BasicInfo/index.jsx
+++ b/src/shared/components/Settings/Profile/BasicInfo/index.jsx
@@ -95,6 +95,16 @@ export default class BasicInfo extends ConsentComponent {
         inputChanged: false,
       });
     }
+    if (nextProps.lookupData) {
+      const { countries } = nextProps.lookupData;
+      const { newBasicInfo } = this.state;
+      if (!newBasicInfo.country) {
+        const code = newBasicInfo.homeCountryCode || newBasicInfo.competitionCountryCode;
+        const { country } = countries.find(c => c.countryCode === code) || {};
+        newBasicInfo.country = country;
+        this.setState({ newBasicInfo });
+      }
+    }
   }
 
   onCheckFormValue(newBasicInfo) {
@@ -455,8 +465,6 @@ export default class BasicInfo extends ConsentComponent {
       key: country.countryCode,
       name: country.country,
     }));
-    const countryCode = newBasicInfo.homeCountryCode || newBasicInfo.competitionCountryCode;
-    const currentCountry = newBasicInfo.country || countries.find(c => c.key === countryCode);
 
     return (
       <div styleName="basic-info-container">
@@ -593,7 +601,7 @@ export default class BasicInfo extends ConsentComponent {
                 <Select
                   name="country"
                   options={countries}
-                  value={currentCountry}
+                  value={newBasicInfo.country}
                   onChange={this.onUpdateCountry}
                   placeholder="Country"
                   matchPos="start"
@@ -803,7 +811,7 @@ export default class BasicInfo extends ConsentComponent {
                   <Select
                     name="countryId"
                     options={countries}
-                    value={currentCountry}
+                    value={newBasicInfo.country}
                     onChange={this.onUpdateCountry}
                     placeholder="Country"
                     matchPos="start"