Code cleanup for connected-indicator-info-popup

MetaMask · Apr 22, 2020 · e3735f8 · e3735f8
1 parent 64c43de
commit e3735f8
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 23 deletions.
diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
@@ -1636,7 +1636,7 @@
   "welcome": {
     "message": "Welcome to MetaMask"
   },
-  "whatsthis": {
+  "whatsThis": {
     "message": "What's this?"
   },
   "writePhrase": {

diff --git a/ui/app/components/ui/popover/index.scss b/ui/app/components/ui/popover/index.scss
@@ -117,9 +117,6 @@
     background: white;
     position: absolute;
     transform: rotate(45deg);
-    top: -6px;
-    left: 24px;
-    display: flex;
     box-shadow: 0px 4px 30px rgba(0, 0, 0, 0.25);
   }
 }
diff --git a/ui/app/components/ui/popover/popover.component.js b/ui/app/components/ui/popover/popover.component.js
@@ -80,7 +80,9 @@ Popover.propTypes = {
   footerClassName: PropTypes.string,
   onBack: PropTypes.func,
   onClose: PropTypes.func.isRequired,
-  CustomBackground: PropTypes.node,
+  CustomBackground: PropTypes.func,
+  className: PropTypes.string,
+  showArrow: PropTypes.bool,
 }
 
 export default class PopoverPortal extends PureComponent {

diff --git a/ui/app/pages/home/home.component.js b/ui/app/pages/home/home.component.js
@@ -57,10 +57,6 @@ export default class Home extends PureComponent {
     connectedStatusPopoverHasBeenShown: PropTypes.bool,
   }
 
-  state = {
-    hidePopover: false,
-  }
-
   UNSAFE_componentWillMount () {
     const {
       history,
@@ -185,7 +181,7 @@ export default class Home extends PureComponent {
     const { t } = this.context
     return (
       <Popover
-        title={ t('whatsthis') }
+        title={ t('whatsThis') }
         onClose={setConnectedStatusPopoverHasBeenShown}
         className="home__connected-status-popover"
         showArrow
@@ -207,7 +203,6 @@ export default class Home extends PureComponent {
             { t('dismiss') }
           </Button>
         )}
-        footerClassName="home__connected-status-popover-footer"
       >
         <main className="home__connect-status-text">
           <div>{ t('metaMaskConnectStatusParagraphOne') }</div>

diff --git a/ui/app/pages/home/index.scss b/ui/app/pages/home/index.scss
@@ -63,6 +63,26 @@
     .popover-content {
       overflow-y: auto;
     }
+
+    .popover-arrow {
+      top: -6px;
+      left: 24px;
+    }
+
+    .popover-footer {
+      justify-content: flex-end;
+
+      & :only-child {
+        margin: 0;
+      }
+
+      button {
+        height: 39px;
+        width: 133px;
+        border-radius: 39px;
+        padding: 0;
+      }
+    }
   }
 
   &__connected-status-popover-bg {
@@ -81,16 +101,4 @@
     height: 100%;
     width: 100%;
   }
-
-  &__connect-status-popover-footer {
-    margin: 0;
-    justify-content: flex-end;
-
-    button {
-      height: 39px;
-      width: 133px;
-      border-radius: 39px;
-      padding: 0;
-    }
-  }
 }