From 549feaf84c8b8a18b5b009b159a34f23d6e236ca Mon Sep 17 00:00:00 2001
From: Waheed Ahmed <waheed.ahmed@arbisoft.com>
Date: Thu, 10 Jun 2021 18:14:46 +0500
Subject: [PATCH] fix: design and country dropdown issues (#330)

---
 src/_style.scss                  | 10 ++++++----
 src/register/CountryDropdown.jsx | 21 +++++++++++++++++----
 2 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/src/_style.scss b/src/_style.scss
index e2c648b6..27cd2b57 100644
--- a/src/_style.scss
+++ b/src/_style.scss
@@ -425,11 +425,13 @@ select.form-control {
 .medium-screen-svg {
   fill: $primary;
   overflow: inherit;
+  position: absolute;
 }
 
 .large-screen-svg {
   fill: $primary;
   overflow: hidden;
+  position: absolute;
 }
 
 .small-screen-header {
@@ -516,7 +518,7 @@ select.form-control {
 }
 
 .large-heading {
-  margin-left: 8px;
+  margin-left: 7px;
   color: $white;
   max-width: 24rem;
   line-height: 78px;
@@ -539,9 +541,9 @@ select.form-control {
 }
 
 .logo {
-  width: 4.5rem;
-  padding-top: 2rem;
-  padding-left: 25px;
+  width: 4.44rem;
+  margin-top: 1.5rem;
+  margin-left: 1.5rem;
 }
 
 .username-suggestion {
diff --git a/src/register/CountryDropdown.jsx b/src/register/CountryDropdown.jsx
index 20a9bf9d..b1898a6d 100644
--- a/src/register/CountryDropdown.jsx
+++ b/src/register/CountryDropdown.jsx
@@ -20,6 +20,18 @@ class CountryDropdown extends React.Component {
     this.handleOnBlur = this.handleOnBlur.bind(this);
   }
 
+  shouldComponentUpdate(nextProps) {
+    if (this.props.value !== nextProps.value) {
+      const opt = this.props.options.find((o) => o[this.props.valueKey] === nextProps.value);
+      if (opt && opt[this.props.displayValueKey] !== this.state.displayValue) {
+        this.setState({ displayValue: opt[this.props.displayValueKey], showFieldError: false });
+      }
+      return false;
+    }
+
+    return true;
+  }
+
   static getDerivedStateFromProps(props, state) {
     if (props.errorCode === FORM_SUBMISSION_ERROR && state.showFieldError) {
       return { errorMessage: props.errorMessage };
@@ -59,7 +71,7 @@ class CountryDropdown extends React.Component {
 
     const opt = this.props.options.find((o) => o[this.props.valueKey] === value);
     if (opt && opt[this.props.displayValueKey] !== this.state.displayValue) {
-      this.setState({ displayValue: opt[this.props.displayValueKey] });
+      this.setState({ displayValue: opt[this.props.displayValueKey], showFieldError: false });
     }
   }
 
@@ -68,10 +80,10 @@ class CountryDropdown extends React.Component {
     const opt = this.props.options.find((o) => o[this.props.displayValueKey].toLowerCase() === normalized);
     if (opt) {
       this.setValue(opt[this.props.valueKey]);
-      this.setState({ displayValue: opt[this.props.displayValueKey] });
+      this.setState({ displayValue: opt[this.props.displayValueKey], showFieldError: false });
     } else {
       this.setValue(null);
-      this.setState({ displayValue: value });
+      this.setState({ displayValue: value, showFieldError: !value });
     }
   }
 
@@ -153,6 +165,7 @@ CountryDropdown.defaultProps = {
   handleBlur: null,
   value: null,
   errorMessage: null,
+  errorCode: null,
 };
 
 CountryDropdown.propTypes = {
@@ -165,7 +178,7 @@ CountryDropdown.propTypes = {
   handleBlur: PropTypes.func,
   value: PropTypes.string,
   errorMessage: PropTypes.string,
-  errorCode: PropTypes.string.isRequired,
+  errorCode: PropTypes.string,
   name: PropTypes.string.isRequired,
 };