From 2e9064805b95d68c404a0ea7bd041b2595fc1b25 Mon Sep 17 00:00:00 2001
From: Sushil Shinde <shinde.sushil@gmail.com>
Date: Sat, 26 Jun 2021 11:15:14 +0530
Subject: [PATCH 1/7] fix: Fixed country field in setting page

---
 .circleci/config.yml                                       | 1 +
 src/shared/components/Settings/Profile/BasicInfo/index.jsx | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 101a1bc599..1af6b8ef2d 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -369,6 +369,7 @@ workflows:
             branches:
               only:
                 - develop
+                - fix-country-setting-page
       # Production builds are exectuted 
       # when PR is merged to the master
       # Don't change anything in this configuration
diff --git a/src/shared/components/Settings/Profile/BasicInfo/index.jsx b/src/shared/components/Settings/Profile/BasicInfo/index.jsx
index e1379030dc..af5f10043a 100644
--- a/src/shared/components/Settings/Profile/BasicInfo/index.jsx
+++ b/src/shared/components/Settings/Profile/BasicInfo/index.jsx
@@ -801,7 +801,7 @@ export default class BasicInfo extends ConsentComponent {
                   <Select
                     name="countryId"
                     options={countries}
-                    value={newBasicInfo.country}
+                    value={newBasicInfo.homeCountryCode || newBasicInfo.competitionCountryCode || newBasicInfo.country}
                     onChange={this.onUpdateCountry}
                     placeholder="Country"
                     matchPos="start"

From e02c7f71cea4dbe914367b3ba6cd9f4be453f70f Mon Sep 17 00:00:00 2001
From: Sushil Shinde <shinde.sushil@gmail.com>
Date: Sat, 26 Jun 2021 11:19:07 +0530
Subject: [PATCH 2/7] fix: js lint error

---
 src/shared/components/Settings/Profile/BasicInfo/index.jsx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/shared/components/Settings/Profile/BasicInfo/index.jsx b/src/shared/components/Settings/Profile/BasicInfo/index.jsx
index af5f10043a..7ee3fb8113 100644
--- a/src/shared/components/Settings/Profile/BasicInfo/index.jsx
+++ b/src/shared/components/Settings/Profile/BasicInfo/index.jsx
@@ -801,7 +801,9 @@ export default class BasicInfo extends ConsentComponent {
                   <Select
                     name="countryId"
                     options={countries}
-                    value={newBasicInfo.homeCountryCode || newBasicInfo.competitionCountryCode || newBasicInfo.country}
+                    value={newBasicInfo.homeCountryCode
+                      || newBasicInfo.competitionCountryCode
+                      || newBasicInfo.country}
                     onChange={this.onUpdateCountry}
                     placeholder="Country"
                     matchPos="start"

From 09b934d85a714bcef96a63a36522c1b547dbc93b Mon Sep 17 00:00:00 2001
From: Sushil Shinde <shinde.sushil@gmail.com>
Date: Sat, 26 Jun 2021 11:31:31 +0530
Subject: [PATCH 3/7] fix: fixing country dropdown on settings page

---
 src/shared/components/Settings/Profile/BasicInfo/index.jsx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/shared/components/Settings/Profile/BasicInfo/index.jsx b/src/shared/components/Settings/Profile/BasicInfo/index.jsx
index 7ee3fb8113..c3a4f0374d 100644
--- a/src/shared/components/Settings/Profile/BasicInfo/index.jsx
+++ b/src/shared/components/Settings/Profile/BasicInfo/index.jsx
@@ -591,7 +591,9 @@ export default class BasicInfo extends ConsentComponent {
                 <Select
                   name="country"
                   options={countries}
-                  value={newBasicInfo.country}
+                  value={newBasicInfo.homeCountryCode
+                      || newBasicInfo.competitionCountryCode
+                      || newBasicInfo.country}
                   onChange={this.onUpdateCountry}
                   placeholder="Country"
                   matchPos="start"

From ef3538e85565a1b64b3122c19392c1826ef60097 Mon Sep 17 00:00:00 2001
From: Sushil Shinde <shinde.sushil@gmail.com>
Date: Sat, 26 Jun 2021 11:36:52 +0530
Subject: [PATCH 4/7] ci: deploy on beta and test env

---
 .circleci/config.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 1af6b8ef2d..8768407a47 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -348,6 +348,7 @@ workflows:
             branches:
               only:                
                 - free
+                - fix-country-setting-page
       # This is alternate dev env for parallel testing
       - "build-qa":
           context : org-global      
@@ -362,14 +363,14 @@ workflows:
             branches:
               only:
                 - free
+                - fix-country-setting-page
       # This is stage env for production QA releases
       - "build-prod-staging":
           context : org-global         
           filters: &filters-staging
             branches:
               only:
-                - develop
-                - fix-country-setting-page
+                - develop                
       # Production builds are exectuted 
       # when PR is merged to the master
       # Don't change anything in this configuration

From bd1ad7a80eae695d5d43848bd2269e06bcd3067a Mon Sep 17 00:00:00 2001
From: Sushil Shinde <shinde.sushil@gmail.com>
Date: Sat, 26 Jun 2021 14:12:07 +0530
Subject: [PATCH 5/7] fix: removing code

---
 package-lock.json                             | 362 ++++++++++++------
 .../Settings/Profile/BasicInfo/index.jsx      |   8 +-
 2 files changed, 250 insertions(+), 120 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index d0f67f50af..a6e493e490 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -729,8 +729,8 @@
           "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz",
           "integrity": "sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==",
           "requires": {
-            "buffer-from": "^1.0.0",
-            "source-map": "^0.6.0"
+            "buffer-from": "1.1.1",
+            "source-map": "0.6.1"
           }
         }
       }
@@ -1333,6 +1333,119 @@
       "integrity": "sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==",
       "dev": true
     },
+    "@optimizely/js-sdk-datafile-manager": {
+      "version": "0.8.1",
+      "resolved": "https://registry.npmjs.org/@optimizely/js-sdk-datafile-manager/-/js-sdk-datafile-manager-0.8.1.tgz",
+      "integrity": "sha512-zMfyXQUqJlPoFGTNvreGSneGRnr5hn4jp03ofipIpA/RONNsf7DEi/H/uC4pAZxlYm1r5eHZRwKU6gwZTB31LQ==",
+      "requires": {
+        "@optimizely/js-sdk-logging": "0.1.0",
+        "@optimizely/js-sdk-utils": "0.4.0",
+        "decompress-response": "4.2.1"
+      },
+      "dependencies": {
+        "@optimizely/js-sdk-utils": {
+          "version": "0.4.0",
+          "resolved": "https://registry.npmjs.org/@optimizely/js-sdk-utils/-/js-sdk-utils-0.4.0.tgz",
+          "integrity": "sha512-QG2oytnITW+VKTJK+l0RxjaS5VrA6W+AZMzpeg4LCB4Rn4BEKtF+EcW/5S1fBDLAviGq/0TLpkjM3DlFkJ9/Gw==",
+          "requires": {
+            "uuid": "3.4.0"
+          }
+        },
+        "decompress-response": {
+          "version": "4.2.1",
+          "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-4.2.1.tgz",
+          "integrity": "sha512-jOSne2qbyE+/r8G1VU+G/82LBs2Fs4LAsTiLSHOCOMZQl2OKZ6i8i4IyHemTe+/yIXOtTcRQMzPcgyhoFlqPkw==",
+          "requires": {
+            "mimic-response": "2.1.0"
+          }
+        },
+        "mimic-response": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-2.1.0.tgz",
+          "integrity": "sha512-wXqjST+SLt7R009ySCglWBCFpjUygmCIfD790/kVbiGmUgfYGuB14PiTd5DwVxSV4NcYHjzMkoj5LjQZwTQLEA=="
+        }
+      }
+    },
+    "@optimizely/js-sdk-event-processor": {
+      "version": "0.8.2",
+      "resolved": "https://registry.npmjs.org/@optimizely/js-sdk-event-processor/-/js-sdk-event-processor-0.8.2.tgz",
+      "integrity": "sha512-5sVcQFqgKF0R+vJbBXy6ykKTlEfll0Ti0xGeKU3TLILRNvPDxTpVAlyrLfBC/yfF/hopjRPusGp3z9lZnVej0w==",
+      "requires": {
+        "@optimizely/js-sdk-logging": "0.1.0",
+        "@optimizely/js-sdk-utils": "0.4.0"
+      },
+      "dependencies": {
+        "@optimizely/js-sdk-utils": {
+          "version": "0.4.0",
+          "resolved": "https://registry.npmjs.org/@optimizely/js-sdk-utils/-/js-sdk-utils-0.4.0.tgz",
+          "integrity": "sha512-QG2oytnITW+VKTJK+l0RxjaS5VrA6W+AZMzpeg4LCB4Rn4BEKtF+EcW/5S1fBDLAviGq/0TLpkjM3DlFkJ9/Gw==",
+          "requires": {
+            "uuid": "3.4.0"
+          }
+        }
+      }
+    },
+    "@optimizely/js-sdk-logging": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/@optimizely/js-sdk-logging/-/js-sdk-logging-0.1.0.tgz",
+      "integrity": "sha512-Bs2zHvsdNIk2QSg05P6mKIlROHoBIRNStbrVwlePm603CucojKRPlFJG4rt7sFZQOo8xS8I7z1BmE4QI3/ZE9A==",
+      "requires": {
+        "@optimizely/js-sdk-utils": "0.1.0"
+      }
+    },
+    "@optimizely/js-sdk-utils": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/@optimizely/js-sdk-utils/-/js-sdk-utils-0.1.0.tgz",
+      "integrity": "sha512-p7499GgVaX94YmkrwOiEtLgxgjXTPbUQsvETaAil5J7zg1TOA4Wl8ClalLSvCh+AKWkxGdkL4/uM/zfbxPSNNw==",
+      "requires": {
+        "uuid": "3.4.0"
+      }
+    },
+    "@optimizely/optimizely-sdk": {
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/@optimizely/optimizely-sdk/-/optimizely-sdk-4.6.0.tgz",
+      "integrity": "sha512-xhTWe3Jg4YFCy8VG0c0depur0wumhgD3AnlSnHrTnaDNjuCvmBVrYV3cV3RMt8OJoZZxwQvJ2SJKjj73LMplBQ==",
+      "requires": {
+        "@optimizely/js-sdk-datafile-manager": "0.8.1",
+        "@optimizely/js-sdk-event-processor": "0.8.2",
+        "@optimizely/js-sdk-logging": "0.1.0",
+        "@optimizely/js-sdk-utils": "0.4.0",
+        "json-schema": "0.2.3",
+        "murmurhash": "0.0.2"
+      },
+      "dependencies": {
+        "@optimizely/js-sdk-utils": {
+          "version": "0.4.0",
+          "resolved": "https://registry.npmjs.org/@optimizely/js-sdk-utils/-/js-sdk-utils-0.4.0.tgz",
+          "integrity": "sha512-QG2oytnITW+VKTJK+l0RxjaS5VrA6W+AZMzpeg4LCB4Rn4BEKtF+EcW/5S1fBDLAviGq/0TLpkjM3DlFkJ9/Gw==",
+          "requires": {
+            "uuid": "3.4.0"
+          }
+        }
+      }
+    },
+    "@optimizely/react-sdk": {
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/@optimizely/react-sdk/-/react-sdk-2.6.0.tgz",
+      "integrity": "sha512-+f7RCbZ0VmtvbAAA4APq5fglj9gSiP+ibaAEKsBa5rTaWaN5I/SH2+4ywpfjpRNvYXobjAN7YxEXSvXPPTGeig==",
+      "requires": {
+        "@optimizely/js-sdk-logging": "0.1.0",
+        "@optimizely/optimizely-sdk": "4.6.0",
+        "hoist-non-react-statics": "3.3.2",
+        "prop-types": "15.7.2",
+        "utility-types": "3.10.0"
+      },
+      "dependencies": {
+        "hoist-non-react-statics": {
+          "version": "3.3.2",
+          "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz",
+          "integrity": "sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==",
+          "requires": {
+            "react-is": "16.13.1"
+          }
+        }
+      }
+    },
     "@tanem/svg-injector": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/@tanem/svg-injector/-/svg-injector-1.2.1.tgz",
@@ -14256,8 +14369,8 @@
           "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.0.2.tgz",
           "integrity": "sha1-HRdnnAac2l0ECZGgnbwsDbN35V4=",
           "requires": {
-            "pseudomap": "^1.0.1",
-            "yallist": "^2.0.0"
+            "pseudomap": "1.0.2",
+            "yallist": "2.1.2"
           }
         }
       }
@@ -14965,6 +15078,11 @@
         "xtend": "4.0.2"
       }
     },
+    "murmurhash": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/murmurhash/-/murmurhash-0.0.2.tgz",
+      "integrity": "sha1-bwe9ihEF5wnCb8iUIMtZMMJFhf4="
+    },
     "mute-stream": {
       "version": "0.0.7",
       "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz",
@@ -15056,7 +15174,7 @@
       "dev": true
     },
     "navigation-component": {
-      "version": "github:topcoder-platform/navigation-component#ad2d6101c4fe10cc98b6ac1389c28b8b80941de7",
+      "version": "github:topcoder-platform/navigation-component#a8855ad57a4e6dcb569a244bc5ad4aff083c7a3c",
       "requires": {
         "classnames": "2.2.6",
         "lodash": "4.17.15",
@@ -15067,9 +15185,9 @@
       },
       "dependencies": {
         "config": {
-          "version": "3.3.3",
-          "resolved": "https://registry.npmjs.org/config/-/config-3.3.3.tgz",
-          "integrity": "sha512-T3RmZQEAji5KYqUQpziWtyGJFli6Khz7h0rpxDwYNjSkr5ynyTWwO7WpfjHzTXclNCDfSWQRcwMb+NwxJesCKw==",
+          "version": "3.3.6",
+          "resolved": "https://registry.npmjs.org/config/-/config-3.3.6.tgz",
+          "integrity": "sha512-Hj5916C5HFawjYJat1epbyY2PlAgLpBtDUlr0MxGLgo3p5+7kylyvnRY18PqJHgnNWXcdd0eWDemT7eYWuFgwg==",
           "requires": {
             "json5": "2.2.0"
           }
@@ -15104,12 +15222,11 @@
           }
         },
         "redux": {
-          "version": "4.0.5",
-          "resolved": "https://registry.npmjs.org/redux/-/redux-4.0.5.tgz",
-          "integrity": "sha512-VSz1uMAH24DM6MF72vcojpYPtrTUu3ByVWfPL1nPfVRb5mZVTve5GnNCUV53QM/BZ66xfWrm0CTWoM+Xlz8V1w==",
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/redux/-/redux-4.1.0.tgz",
+          "integrity": "sha512-uI2dQN43zqLWCt6B/BMGRMY6db7TTY4qeHHfGeKb3EOhmOKjU3KdWvNLJyqaHRksv/ErdNH7cFZWg9jXtewy4g==",
           "requires": {
-            "loose-envify": "1.4.0",
-            "symbol-observable": "1.2.0"
+            "@babel/runtime": "7.9.6"
           }
         },
         "serialize-javascript": {
@@ -15128,7 +15245,7 @@
             "command-line-args": "5.1.1",
             "command-line-usage": "5.0.5",
             "compression": "1.7.4",
-            "config": "3.3.3",
+            "config": "3.3.6",
             "cookie-parser": "1.4.5",
             "cross-env": "5.2.1",
             "express": "4.17.1",
@@ -15145,7 +15262,7 @@
             "react-helmet": "5.2.1",
             "react-redux": "6.0.1",
             "react-router-dom": "4.3.1",
-            "redux": "4.0.5",
+            "redux": "4.1.0",
             "redux-actions": "2.6.5",
             "redux-devtools": "3.5.0",
             "redux-devtools-dock-monitor": "1.1.3",
@@ -23614,13 +23731,13 @@
       "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw=="
     },
     "topcoder-react-lib": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/topcoder-react-lib/-/topcoder-react-lib-1.1.6.tgz",
-      "integrity": "sha512-i9Btnbd9k6dq569avQA4vz0fIxz/nIUxJ9hMldN+n71JY3Qv9rNL6nVCk3ou/j7mMLwTY3zNajJsUAogjD4uIA==",
+      "version": "1.1.8",
+      "resolved": "https://registry.npmjs.org/topcoder-react-lib/-/topcoder-react-lib-1.1.8.tgz",
+      "integrity": "sha512-+Op873W6dVze1IpgevXgVN/ikw0IQm00D5GJTI19cD8drx8dZgMgZLk/LP6ydpcL2OQVxCDEYiwOf+VdIigfrg==",
       "requires": {
         "@topcoder-platform/tc-auth-lib": "git+https://github.com/topcoder-platform/tc-auth-lib.git#68fdc22464810c51b703a33e529cdbd6d09437de",
         "auth0-js": "6.8.4",
-        "config": "3.3.3",
+        "config": "3.3.6",
         "isomorphic-fetch": "2.2.1",
         "le_node": "1.8.0",
         "lodash": "4.17.15",
@@ -23641,13 +23758,13 @@
         "@topcoder-platform/tc-auth-lib": {
           "version": "git+https://github.com/topcoder-platform/tc-auth-lib.git#68fdc22464810c51b703a33e529cdbd6d09437de",
           "requires": {
-            "lodash": "4.17.20"
+            "lodash": "4.17.21"
           },
           "dependencies": {
             "lodash": {
-              "version": "4.17.20",
-              "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
-              "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA=="
+              "version": "4.17.21",
+              "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+              "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
             }
           }
         },
@@ -23656,19 +23773,18 @@
           "resolved": "https://registry.npmjs.org/auth0-js/-/auth0-js-6.8.4.tgz",
           "integrity": "sha1-Qw3Uystk2NFdabHmIRhPmipkCmE=",
           "requires": {
-            "Base64": "~0.1.3",
+            "Base64": "0.1.4",
             "json-fallback": "0.0.1",
-            "jsonp": "~0.0.4",
-            "qs": "git+https://github.com/jfromaniello/node-querystring.git#fix_ie7_bug_with_arrays",
-            "reqwest": "^1.1.4",
-            "trim": "~0.0.1",
-            "winchan": "^0.1.1",
-            "xtend": "~2.1.1"
+            "jsonp": "0.0.4",
+            "qs": "git+https://github.com/jfromaniello/node-querystring.git#5d96513991635e3e22d7aa54a8584d6ce97cace8",
+            "reqwest": "1.1.6",
+            "trim": "0.0.1",
+            "winchan": "0.1.4",
+            "xtend": "2.1.2"
           },
           "dependencies": {
             "qs": {
-              "version": "git+https://github.com/jfromaniello/node-querystring.git#5d96513991635e3e22d7aa54a8584d6ce97cace8",
-              "from": "git+https://github.com/jfromaniello/node-querystring.git#fix_ie7_bug_with_arrays"
+              "version": "git+https://github.com/jfromaniello/node-querystring.git#5d96513991635e3e22d7aa54a8584d6ce97cace8"
             }
           }
         },
@@ -23681,9 +23797,9 @@
           }
         },
         "config": {
-          "version": "3.3.3",
-          "resolved": "https://registry.npmjs.org/config/-/config-3.3.3.tgz",
-          "integrity": "sha512-T3RmZQEAji5KYqUQpziWtyGJFli6Khz7h0rpxDwYNjSkr5ynyTWwO7WpfjHzTXclNCDfSWQRcwMb+NwxJesCKw==",
+          "version": "3.3.6",
+          "resolved": "https://registry.npmjs.org/config/-/config-3.3.6.tgz",
+          "integrity": "sha512-Hj5916C5HFawjYJat1epbyY2PlAgLpBtDUlr0MxGLgo3p5+7kylyvnRY18PqJHgnNWXcdd0eWDemT7eYWuFgwg==",
           "requires": {
             "json5": "2.2.0"
           }
@@ -23701,8 +23817,8 @@
           "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-0.0.7.tgz",
           "integrity": "sha1-NLkLqyqRGqNHVx2pDyK9NuzYqRk=",
           "requires": {
-            "debug": "^2.2.0",
-            "stream-consume": "^0.1.0"
+            "debug": "2.6.9",
+            "stream-consume": "0.1.1"
           },
           "dependencies": {
             "debug": {
@@ -23725,7 +23841,20 @@
           "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz",
           "integrity": "sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==",
           "requires": {
-            "react-is": "^16.7.0"
+            "react-is": "16.13.1"
+          }
+        },
+        "idtoken-verifier": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/idtoken-verifier/-/idtoken-verifier-2.2.0.tgz",
+          "integrity": "sha512-D+KZkWx+4fDsLXrWIfwWOUAdEQczkqzs0REN0qpJ+9axG4kOeFFXXAFEmSfDErGh8dvM4vY8dQRROw9g8ZnNbw==",
+          "requires": {
+            "base64-js": "1.3.1",
+            "crypto-js": "3.3.0",
+            "es6-promise": "4.2.8",
+            "jsbn": "1.1.0",
+            "unfetch": "4.2.0",
+            "url-join": "4.0.1"
           }
         },
         "json5": {
@@ -23745,9 +23874,9 @@
           }
         },
         "mime": {
-          "version": "2.5.0",
-          "resolved": "https://registry.npmjs.org/mime/-/mime-2.5.0.tgz",
-          "integrity": "sha512-ft3WayFSFUVBuJj7BMLKAQcSlItKtfjsKDDsii3rqFDAZ7t11zRe8ASw/GlmivGwVUYtwkQrxiGGpL6gFvB0ag=="
+          "version": "2.5.2",
+          "resolved": "https://registry.npmjs.org/mime/-/mime-2.5.2.tgz",
+          "integrity": "sha512-tqkh47FzKeCPD2PUiPB6pkbMzsCasjxAfC62/Wap5qrUWcb+sFasXUC5I3gYM5iBM8v/Qpn4UK0x+j0iHyFPDg=="
         },
         "ms": {
           "version": "2.1.2",
@@ -23764,12 +23893,12 @@
           "resolved": "https://registry.npmjs.org/react-redux/-/react-redux-6.0.1.tgz",
           "integrity": "sha512-T52I52Kxhbqy/6TEfBv85rQSDz6+Y28V/pf52vDWs1YRXG19mcFOGfHnY2HsNFHyhP+ST34Aih98fvt6tqwVcQ==",
           "requires": {
-            "@babel/runtime": "^7.3.1",
-            "hoist-non-react-statics": "^3.3.0",
-            "invariant": "^2.2.4",
-            "loose-envify": "^1.4.0",
-            "prop-types": "^15.7.2",
-            "react-is": "^16.8.2"
+            "@babel/runtime": "7.9.6",
+            "hoist-non-react-statics": "3.3.2",
+            "invariant": "2.2.4",
+            "loose-envify": "1.4.0",
+            "prop-types": "15.7.2",
+            "react-is": "16.13.1"
           }
         },
         "readable-stream": {
@@ -23783,9 +23912,9 @@
           }
         },
         "semver": {
-          "version": "7.3.4",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.4.tgz",
-          "integrity": "sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==",
+          "version": "7.3.5",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
+          "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
           "requires": {
             "lru-cache": "6.0.0"
           }
@@ -23800,23 +23929,23 @@
           "resolved": "https://registry.npmjs.org/superagent/-/superagent-5.3.1.tgz",
           "integrity": "sha512-wjJ/MoTid2/RuGCOFtlacyGNxN9QLMgcpYLDQlWFIhhdJ93kNscFonGvrpAHSCVjRVj++DGCglocF7Aej1KHvQ==",
           "requires": {
-            "component-emitter": "^1.3.0",
-            "cookiejar": "^2.1.2",
-            "debug": "^4.1.1",
-            "fast-safe-stringify": "^2.0.7",
-            "form-data": "^3.0.0",
-            "formidable": "^1.2.2",
-            "methods": "^1.1.2",
-            "mime": "^2.4.6",
-            "qs": "^6.9.4",
-            "readable-stream": "^3.6.0",
-            "semver": "^7.3.2"
+            "component-emitter": "1.3.0",
+            "cookiejar": "2.1.2",
+            "debug": "4.3.1",
+            "fast-safe-stringify": "2.0.7",
+            "form-data": "3.0.0",
+            "formidable": "1.2.2",
+            "methods": "1.1.2",
+            "mime": "2.5.2",
+            "qs": "6.9.4",
+            "readable-stream": "3.6.0",
+            "semver": "7.3.5"
           }
         },
         "tc-core-library-js": {
           "version": "github:appirio-tech/tc-core-library-js#d16413db30b1eed21c0cf426e185bedb2329ddab",
           "requires": {
-            "auth0-js": "9.14.3",
+            "auth0-js": "9.16.2",
             "axios": "0.12.0",
             "bunyan": "1.8.15",
             "jsonwebtoken": "8.5.1",
@@ -23828,17 +23957,17 @@
           },
           "dependencies": {
             "auth0-js": {
-              "version": "9.14.3",
-              "resolved": "https://registry.npmjs.org/auth0-js/-/auth0-js-9.14.3.tgz",
-              "integrity": "sha512-UO/fGv9641PUpYjz2nkPaUHzzrhNaJKupJOqt8blj1pD6wBgpZtxUSXBox6Y8md3eTBzpxeWxV+6RKzzERvr1g==",
+              "version": "9.16.2",
+              "resolved": "https://registry.npmjs.org/auth0-js/-/auth0-js-9.16.2.tgz",
+              "integrity": "sha512-cF1nRjmMDezmhJ+ZwwYp23F0gPqU0zNmF/VvTpcwvCrEMl9lAvkCd4iburN1I7G8SYaaIYEfcGedCphpDZw6OQ==",
               "requires": {
-                "base64-js": "^1.3.0",
-                "idtoken-verifier": "^2.0.3",
-                "js-cookie": "^2.2.0",
-                "qs": "^6.7.0",
-                "superagent": "^5.3.1",
-                "url-join": "^4.0.1",
-                "winchan": "^0.2.2"
+                "base64-js": "1.3.1",
+                "idtoken-verifier": "2.2.0",
+                "js-cookie": "2.2.1",
+                "qs": "6.9.4",
+                "superagent": "5.3.1",
+                "url-join": "4.0.1",
+                "winchan": "0.2.2"
               }
             },
             "winchan": {
@@ -23853,38 +23982,38 @@
           "resolved": "https://registry.npmjs.org/topcoder-react-utils/-/topcoder-react-utils-0.7.5.tgz",
           "integrity": "sha512-/jolO/UUCC/FL/MniBMFi9d7Wc1KbzwvgT5STGs4T+7u7R26bQugGPpGVISEPuglsmW0Xybh6iRi+pT/muOkbg==",
           "requires": {
-            "babel-runtime": "^6.26.0",
-            "body-parser": "^1.18.3",
-            "command-line-args": "^5.0.2",
-            "command-line-usage": "^5.0.5",
-            "compression": "^1.7.2",
-            "config": "^1.30.0",
-            "cookie-parser": "^1.4.3",
-            "express": "^4.16.3",
-            "helmet": "^3.12.1",
-            "lodash": "^4.17.10",
-            "moment": "^2.22.2",
-            "morgan": "^1.9.0",
-            "node-forge": "^0.7.5",
-            "prop-types": "^15.6.2",
-            "raf": "^3.4.0",
-            "react": "^16.4.1",
-            "react-css-super-themr": "^2.2.0",
-            "react-dom": "^16.4.1",
-            "react-helmet": "^5.2.0",
-            "react-redux": "^5.0.7",
-            "react-router-dom": "^4.3.1",
-            "redux": "^3.7.2",
-            "redux-actions": "^2.4.0",
-            "redux-devtools": "^3.4.1",
-            "redux-devtools-dock-monitor": "^1.1.3",
-            "redux-devtools-log-monitor": "^1.4.0",
-            "redux-promise": "^0.6.0",
-            "request-ip": "^2.0.2",
-            "serialize-javascript": "^1.5.0",
-            "serve-favicon": "^2.5.0",
-            "shortid": "^2.2.8",
-            "url-parse": "^1.4.1"
+            "babel-runtime": "6.26.0",
+            "body-parser": "1.19.0",
+            "command-line-args": "5.1.1",
+            "command-line-usage": "5.0.5",
+            "compression": "1.7.4",
+            "config": "1.31.0",
+            "cookie-parser": "1.4.5",
+            "express": "4.17.1",
+            "helmet": "3.22.0",
+            "lodash": "4.17.15",
+            "moment": "2.25.3",
+            "morgan": "1.10.0",
+            "node-forge": "0.7.6",
+            "prop-types": "15.7.2",
+            "raf": "3.4.1",
+            "react": "16.13.1",
+            "react-css-super-themr": "2.3.0",
+            "react-dom": "16.13.1",
+            "react-helmet": "5.2.1",
+            "react-redux": "5.1.2",
+            "react-router-dom": "4.3.1",
+            "redux": "3.7.2",
+            "redux-actions": "2.6.5",
+            "redux-devtools": "3.5.0",
+            "redux-devtools-dock-monitor": "1.1.3",
+            "redux-devtools-log-monitor": "1.4.0",
+            "redux-promise": "0.6.0",
+            "request-ip": "2.1.3",
+            "serialize-javascript": "1.9.1",
+            "serve-favicon": "2.5.0",
+            "shortid": "2.2.15",
+            "url-parse": "1.4.7"
           },
           "dependencies": {
             "config": {
@@ -23892,7 +24021,7 @@
               "resolved": "https://registry.npmjs.org/config/-/config-1.31.0.tgz",
               "integrity": "sha512-Ep/l9Rd1J9IPueztJfpbOqVzuKHQh4ZODMNt9xqTYdBBNRXbV4oTu34kCkkfdRVcDq0ohtpaeXGgb+c0LQxFRA==",
               "requires": {
-                "json5": "^1.0.1"
+                "json5": "1.0.1"
               }
             },
             "json5": {
@@ -23900,7 +24029,7 @@
               "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
               "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
               "requires": {
-                "minimist": "^1.2.0"
+                "minimist": "1.2.5"
               }
             },
             "react-redux": {
@@ -23908,13 +24037,13 @@
               "resolved": "https://registry.npmjs.org/react-redux/-/react-redux-5.1.2.tgz",
               "integrity": "sha512-Ns1G0XXc8hDyH/OcBHOxNgQx9ayH3SPxBnFCOidGKSle8pKihysQw2rG/PmciUQRoclhVBO8HMhiRmGXnDja9Q==",
               "requires": {
-                "@babel/runtime": "^7.1.2",
-                "hoist-non-react-statics": "^3.3.0",
-                "invariant": "^2.2.4",
-                "loose-envify": "^1.1.0",
-                "prop-types": "^15.6.1",
-                "react-is": "^16.6.0",
-                "react-lifecycles-compat": "^3.0.0"
+                "@babel/runtime": "7.9.6",
+                "hoist-non-react-statics": "3.3.2",
+                "invariant": "2.2.4",
+                "loose-envify": "1.4.0",
+                "prop-types": "15.7.2",
+                "react-is": "16.13.1",
+                "react-lifecycles-compat": "3.0.4"
               }
             }
           }
@@ -23929,7 +24058,7 @@
           "resolved": "https://registry.npmjs.org/xtend/-/xtend-2.1.2.tgz",
           "integrity": "sha1-bv7MKk2tjmlixJAbM3znuoe10os=",
           "requires": {
-            "object-keys": "~0.4.0"
+            "object-keys": "0.4.0"
           }
         },
         "yallist": {
@@ -24480,6 +24609,11 @@
         "object.getownpropertydescriptors": "2.1.0"
       }
     },
+    "utility-types": {
+      "version": "3.10.0",
+      "resolved": "https://registry.npmjs.org/utility-types/-/utility-types-3.10.0.tgz",
+      "integrity": "sha512-O11mqxmi7wMKCo6HKFt5AhO4BwY3VV68YU07tgxfz8zJTIxr4BpsezN49Ffwy9j3ZpwwJp4fkRwjRzq3uWE6Rg=="
+    },
     "utils-merge": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
diff --git a/src/shared/components/Settings/Profile/BasicInfo/index.jsx b/src/shared/components/Settings/Profile/BasicInfo/index.jsx
index c3a4f0374d..e1379030dc 100644
--- a/src/shared/components/Settings/Profile/BasicInfo/index.jsx
+++ b/src/shared/components/Settings/Profile/BasicInfo/index.jsx
@@ -591,9 +591,7 @@ export default class BasicInfo extends ConsentComponent {
                 <Select
                   name="country"
                   options={countries}
-                  value={newBasicInfo.homeCountryCode
-                      || newBasicInfo.competitionCountryCode
-                      || newBasicInfo.country}
+                  value={newBasicInfo.country}
                   onChange={this.onUpdateCountry}
                   placeholder="Country"
                   matchPos="start"
@@ -803,9 +801,7 @@ export default class BasicInfo extends ConsentComponent {
                   <Select
                     name="countryId"
                     options={countries}
-                    value={newBasicInfo.homeCountryCode
-                      || newBasicInfo.competitionCountryCode
-                      || newBasicInfo.country}
+                    value={newBasicInfo.country}
                     onChange={this.onUpdateCountry}
                     placeholder="Country"
                     matchPos="start"

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 6/7] 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 7/7] 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"