From 1743ccbdb5df504eab8e3c46c18172b176578be1 Mon Sep 17 00:00:00 2001
From: sdtsui <szehungdanieltsui@gmail.com>
Date: Mon, 14 Aug 2017 08:50:49 +0200
Subject: Center account selection dropdown and specify useCssTransition prop

---
 ui/app/components/dropdowns/components/account-dropdowns.js | 11 ++++++-----
 ui/app/components/wallet-view.js                            |  2 ++
 2 files changed, 8 insertions(+), 5 deletions(-)

(limited to 'ui/app/components')

diff --git a/ui/app/components/dropdowns/components/account-dropdowns.js b/ui/app/components/dropdowns/components/account-dropdowns.js
index 69bef3f1b..11d109d73 100644
--- a/ui/app/components/dropdowns/components/account-dropdowns.js
+++ b/ui/app/components/dropdowns/components/account-dropdowns.js
@@ -64,16 +64,16 @@ class AccountDropdowns extends Component {
   }
 
   renderAccountSelector () {
-    const { actions, dropdownWrapperStyle } = this.props
+    const { actions, dropdownWrapperStyle, useCssTransition } = this.props
     const { accountSelectorActive, menuItemStyles } = this.state
 
     return h(
       Dropdown,
       {
-        useCssTransition: true, // Hardcoded because account selector is temporarily in app-header
+        useCssTransition,
         style: {
-          marginLeft: '-238px',
-          marginTop: '38px',
+          marginLeft: '-185px',
+          marginTop: '50px',
           minWidth: '180px',
           overflowY: 'auto',
           maxHeight: '300px',
@@ -150,12 +150,13 @@ class AccountDropdowns extends Component {
   }
 
   renderAccountOptions () {
-    const { actions, dropdownWrapperStyle } = this.props
+    const { actions, dropdownWrapperStyle, useCssTransition } = this.props
     const { optionsMenuActive, menuItemStyles } = this.state
 
     return h(
       Dropdown,
       {
+        useCssTransition,
         style: Object.assign(
           {
             marginLeft: '-10px',
diff --git a/ui/app/components/wallet-view.js b/ui/app/components/wallet-view.js
index 2b3b55b6a..6bde2d9f4 100644
--- a/ui/app/components/wallet-view.js
+++ b/ui/app/components/wallet-view.js
@@ -72,6 +72,7 @@ WalletView.prototype.render = function () {
           selected: selectedAddress,
           network,
           identities,
+          useCssTransition: true,
           enableAccountOptions: true,
           dropdownWrapperStyle: {
             padding: '1px 15px',
@@ -100,6 +101,7 @@ WalletView.prototype.render = function () {
               left: 'calc(50% + 28px + 5.5px)',
               top: '14px',
             },
+            useCssTransition: true,
             selected: selectedAddress,
             network,
             identities,
-- 
cgit