Merge pull request #639 from aminroosta/aminfix

Fix "Not all accounts are shown in dropdown"

Author: ashkanx

src/sidebar/AccountItemsList.js

@@ -20,7 +20,7 @@ export default class AccountItemsList extends PureComponent {
 				}
 				{accounts
 					.filter(x => x.account !== loginid)
-					.map(x => <AccountMenuItem key={x.token} account={x.account} token={x.token} />)
+					.map(x => <AccountMenuItem key={x.token} account={x.account} token={x.token} currency={x.currency} />)
 				}
 			</div>
 		);

src/sidebar/AccountMenuItem.js

@@ -1,12 +1,12 @@
 import React, { PureComponent } from 'react';
-import { M } from 'binary-components';
 import storage from '../_store/storage';
 
 export default class AccountMenuItem extends PureComponent {
 
 	props: {
 		account: string,
 		token: string,
+		currency: string
 	};
 
 	switchToAccount = () => {
@@ -20,7 +20,7 @@ export default class AccountMenuItem extends PureComponent {
 	};
 
 	render() {
-		const { account } = this.props;
+		const { account, currency } = this.props;
 
 		return (
 			<a
@@ -29,9 +29,9 @@ export default class AccountMenuItem extends PureComponent {
 				onClick={this.switchToAccount}
 			>
 				<img src="img/icon.png" alt="" />
-				<M m="Switch to" />
-				&nbsp;
 				{account}
+				&nbsp;
+				{currency && `(${currency})`}
 			</a>
 		);
 	}

styles/_header.scss

@@ -10,7 +10,9 @@
         display: block;
 
         > .sidebar {
-            top: -300px !important;
+            top: -2000px !important;
+            max-height: 100%;
+            overflow: hidden;
             left: inherit;
             right: 0;
         }

styles/_menus.scss

@@ -25,4 +25,5 @@
 .account-items-list {
     display: flex;
     flex-direction: column;
+    overflow: scroll;
 }

www/boot.js

@@ -35,7 +35,8 @@
             accounts.push({ account: account, token: token, currency : currency || '', });
         }
 
-        return accounts;
+        var sortedAccounts = accounts.sort((a,b) => b.currency.length - a.currency.length);
+        return sortedAccounts;
     }
 
     function readConfig() {