From 8fc5266a8d4a7eb6dd1a9df7b45edc1c19c2d97f Mon Sep 17 00:00:00 2001
From: George Marshall <george.marshall@consensys.net>
Date: Wed, 23 Mar 2022 08:45:52 -0700
Subject: [PATCH] Dark mode: icons ens input (#14133)

* Dark mode ens input on send page icons convert to font-awesome

* Updating for close in dark mode
---
 app/images/check-green-solid.svg              |  6 ---
 app/images/qr-blue.svg                        |  5 --
 .../add-recipient/ens-input.component.js      | 46 +++++++++++++-----
 ui/pages/send/send.scss                       | 48 ++++---------------
 4 files changed, 45 insertions(+), 60 deletions(-)
 delete mode 100644 app/images/check-green-solid.svg
 delete mode 100644 app/images/qr-blue.svg

diff --git a/app/images/check-green-solid.svg b/app/images/check-green-solid.svg
deleted file mode 100644
index 68c46196d..000000000
--- a/app/images/check-green-solid.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<svg fill="none" height="20" width="20" xmlns="http://www.w3.org/2000/svg">
-    <g clip-rule="evenodd" fill-rule="evenodd">
-        <path d="M.833 10a9.167 9.167 0 1118.334 0A9.167 9.167 0 01.833 10z" fill="#28a745"/>
-        <path d="M14.426 6.702a.833.833 0 010 1.179l-5.173 5.417a.833.833 0 01-1.178 0l-2.5-2.5a.833.833 0 111.178-1.179l1.91 1.91 4.584-4.827a.833.833 0 011.179 0z" fill="#fff"/>
-    </g>
-</svg>
diff --git a/app/images/qr-blue.svg b/app/images/qr-blue.svg
deleted file mode 100644
index 7310e3e85..000000000
--- a/app/images/qr-blue.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg fill="none" height="24" width="24" xmlns="http://www.w3.org/2000/svg">
-    <g clip-rule="evenodd" fill="#037dd6" fill-rule="evenodd">
-        <path d="M16.32 8H8.64v8h7.68zM8.64 6c-1.06 0-1.92.895-1.92 2v8c0 1.105.86 2 1.92 2h7.68c1.06 0 1.92-.895 1.92-2V8c0-1.105-.86-2-1.92-2zM16.32 1c0-.552.43-1 .96-1h3.84C22.71 0 24 1.343 24 3v4c0 .552-.43 1-.96 1s-.96-.448-.96-1V3c0-.552-.43-1-.96-1h-3.84c-.53 0-.96-.448-.96-1zM23.04 16c.53 0 .96.448.96 1v4c0 1.657-1.29 3-2.88 3h-3.84c-.53 0-.96-.448-.96-1s.43-1 .96-1h3.84c.53 0 .96-.448.96-1v-4c0-.552.43-1 .96-1zM7.68 23c0 .552-.43 1-.96 1H2.88C1.29 24 0 22.657 0 21v-4c0-.552.43-1 .96-1s.96.448.96 1v4c0 .552.43 1 .96 1h3.84c.53 0 .96.448.96 1zM.96 8C.43 8 0 7.552 0 7V3c0-1.657 1.29-3 2.88-3h3.84c.53 0 .96.448.96 1s-.43 1-.96 1H2.88c-.53 0-.96.448-.96 1v4c0 .552-.43 1-.96 1z"/>
-    </g>
-</svg>
diff --git a/ui/pages/send/send-content/add-recipient/ens-input.component.js b/ui/pages/send/send-content/add-recipient/ens-input.component.js
index de0332078..4cf63a7fa 100644
--- a/ui/pages/send/send-content/add-recipient/ens-input.component.js
+++ b/ui/pages/send/send-content/add-recipient/ens-input.component.js
@@ -96,10 +96,16 @@ export default class EnsInput extends Component {
             'ens-input__wrapper--valid': hasSelectedAddress,
           })}
         >
-          <div
-            className={classnames('ens-input__wrapper__status-icon', {
-              'ens-input__wrapper__status-icon--valid': hasSelectedAddress,
+          <i
+            className={classnames('ens-input__wrapper__status-icon', 'fa', {
+              'fa-check-circle': hasSelectedAddress,
+              'fa-search': !hasSelectedAddress,
             })}
+            style={{
+              color: hasSelectedAddress
+                ? 'var(--color-success-default)'
+                : 'var(--color-icon-muted)',
+            }}
           />
           {hasSelectedAddress ? (
             <>
@@ -113,10 +119,18 @@ export default class EnsInput extends Component {
                   </div>
                 )}
               </div>
-              <div
-                className="ens-input__wrapper__action-icon ens-input__wrapper__action-icon--erase"
+              <button
                 onClick={this.props.onReset}
-              />
+                className="ens-input__wrapper__action-icon-button"
+              >
+                <i
+                  className="fa fa-times"
+                  style={{
+                    color: 'var(--color-icon-default)',
+                  }}
+                  title={t('close')}
+                />
+              </button>
             </>
           ) : (
             <>
@@ -133,10 +147,7 @@ export default class EnsInput extends Component {
                 data-testid="ens-input"
               />
               <button
-                className={classnames('ens-input__wrapper__action-icon', {
-                  'ens-input__wrapper__action-icon--erase': userInput,
-                  'ens-input__wrapper__action-icon--qrcode': !userInput,
-                })}
+                className="ens-input__wrapper__action-icon-button"
                 onClick={() => {
                   if (userInput) {
                     this.props.onReset();
@@ -144,7 +155,20 @@ export default class EnsInput extends Component {
                     this.props.scanQrCode();
                   }
                 }}
-              />
+              >
+                <i
+                  className={classnames('fa', {
+                    'fa-times': userInput,
+                    'fa-qrcode': !userInput,
+                  })}
+                  title={t(userInput ? 'close' : 'scanQrCode')}
+                  style={{
+                    color: userInput
+                      ? 'var(--color-icon-default)'
+                      : 'var(--color-primary-default)',
+                  }}
+                />
+              </button>
             </>
           )}
         </div>
diff --git a/ui/pages/send/send.scss b/ui/pages/send/send.scss
index 3bceb1202..670bfbc87 100644
--- a/ui/pages/send/send.scss
+++ b/ui/pages/send/send.scss
@@ -175,20 +175,7 @@
     }
 
     &__status-icon {
-      @extend %bg-contain;
-
-      background-image: url('/images/search-black.svg');
-      width: 1.125rem;
-      height: 1.125rem;
-      margin: 0.25rem 0.5rem 0.25rem 0.25rem;
-
-      [data-theme='dark'] & {
-        background-image: url('/images/search.svg');
-      }
-
-      &--valid {
-        background-image: url('/images/check-green-solid.svg');
-      }
+      margin: 4px 8px 4px 4px;
     }
 
     &__input {
@@ -206,36 +193,21 @@
       }
     }
 
-    &__action-icon {
-      @extend %bg-contain;
-
-      cursor: pointer;
-
-      &--erase {
-        background-image: url('/images/close-gray.svg');
-        background-color: unset;
-        width: 0.75rem;
-        height: 0.75rem;
-        margin: 0 0.25rem;
-      }
-
-      &--qrcode {
-        background-image: url('/images/qr-blue.svg');
-        background-color: unset;
-        width: 1.5rem;
-        height: 1.5rem;
-        margin: 0 0.25rem;
-      }
+    &__action-icon-button {
+      background: none;
+      border: none;
+      padding: 0 8px;
+      height: 24px;
+      font-size: 16px;
+      display: flex;
+      align-items: center;
+      justify-content: center;
     }
 
     &--valid {
       border-color: var(--color-primary-default);
 
       .ens-input__wrapper {
-        &__status-icon {
-          background-image: url('/images/check-green-solid.svg');
-        }
-
         &__input {
           @extend %col-nowrap;