diff options
| author | kumavis <kumavis@users.noreply.github.com> | 2018-06-19 06:11:16 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-19 06:11:16 +0800 |
| commit | 4598554fea7b9435e5cbecc4735c479ffbadf37e (patch) | |
| tree | 338aaee17d433383c9a57b385489cbc8df3f82d0 /ui/app/components/account-menu/index.js | |
| parent | 39a7702c8f0aa2c2e7fdf2bcf913e76bb8b827f4 (diff) | |
| parent | 0e3ecbbc4f7ab0579a33bf315af4dfafeb43f339 (diff) | |
| download | tangerine-wallet-browser-4598554fea7b9435e5cbecc4735c479ffbadf37e.tar tangerine-wallet-browser-4598554fea7b9435e5cbecc4735c479ffbadf37e.tar.gz tangerine-wallet-browser-4598554fea7b9435e5cbecc4735c479ffbadf37e.tar.bz2 tangerine-wallet-browser-4598554fea7b9435e5cbecc4735c479ffbadf37e.tar.lz tangerine-wallet-browser-4598554fea7b9435e5cbecc4735c479ffbadf37e.tar.xz tangerine-wallet-browser-4598554fea7b9435e5cbecc4735c479ffbadf37e.tar.zst tangerine-wallet-browser-4598554fea7b9435e5cbecc4735c479ffbadf37e.zip | |
Merge pull request #4603 from MetaMask/v4.8.0
V4.8.0
Diffstat (limited to 'ui/app/components/account-menu/index.js')
| -rw-r--r-- | ui/app/components/account-menu/index.js | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/ui/app/components/account-menu/index.js b/ui/app/components/account-menu/index.js index 7638995ea..f34631ca8 100644 --- a/ui/app/components/account-menu/index.js +++ b/ui/app/components/account-menu/index.js @@ -135,11 +135,12 @@ AccountMenu.prototype.renderAccounts = function () { showAccountDetail, } = this.props - return Object.keys(identities).map((key, index) => { - const identity = identities[key] + const accountOrder = keyrings.reduce((list, keyring) => list.concat(keyring.accounts), []) + return accountOrder.map((address) => { + const identity = identities[address] const isSelected = identity.address === selectedAddress - const balanceValue = accounts[key] ? accounts[key].balance : '' + const balanceValue = accounts[address] ? accounts[address].balance : '' const formattedBalance = balanceValue ? formatBalance(balanceValue, 6) : '...' const simpleAddress = identity.address.substring(2).toLowerCase() |