Merge pull request #1831 from sdtsui/pre-merge-fixes

Add minor fixes, including account selection scroll

package.json

@@ -87,7 +87,7 @@
     "inject-css": "^0.1.1",
     "jazzicon": "^1.2.0",
     "loglevel": "^1.4.1",
-    "menu-droppo": "1.1.6",
+    "menu-droppo": "2.0.0",
     "metamask-logo": "^2.1.2",
     "mississippi": "^1.2.0",
     "mkdirp": "^0.5.1",

ui/app/app.js

@@ -206,7 +206,9 @@ App.prototype.renderNetworkDropdown = function () {
       left: '2px',
       top: '36px',
     },
-    innerStyle: {},
+    innerStyle: {
+      padding: '2px 16px 2px 0px',
+    },
   }, [
 
     h(

ui/app/components/account-dropdowns.js

@@ -59,6 +59,8 @@ class AccountDropdowns extends Component {
         style: {
           marginLeft: '-125px',
           minWidth: '180px',
+          overflowY: 'auto',
+          maxHeight: '300px',
         },
         isOpen: accountSelectorActive,
         onClickOutside: () => { this.setState({ accountSelectorActive: false }) },
@@ -116,14 +118,6 @@ class AccountDropdowns extends Component {
         onClickOutside: () => { this.setState({ optionsMenuActive: false }) },
       },
       [
-        h(
-          DropdownMenuItem,
-          {
-            closeMenu: () => {},
-            onClick: () => actions.showConfigPage(),
-          },
-          'Account Settings',
-        ),
         h(
           DropdownMenuItem,
           {

ui/app/components/dropdown.js

@@ -7,7 +7,7 @@ const noop = () => {}
 
 class Dropdown extends Component {
   render () {
-    const { isOpen, onClickOutside, style, children } = this.props
+    const { isOpen, onClickOutside, style, innerStyle, children } = this.props
 
     return h(
       MenuDroppo,
@@ -21,6 +21,7 @@ class Dropdown extends Component {
           padding: '8px 16px',
           background: 'rgba(0, 0, 0, 0.8)',
           boxShadow: 'rgba(0, 0, 0, 0.15) 0px 2px 2px 2px',
+          ...innerStyle,
         },
       },
       [