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 /old-ui/app/components | |
| 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 'old-ui/app/components')
| -rw-r--r-- | old-ui/app/components/account-dropdowns.js | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/old-ui/app/components/account-dropdowns.js b/old-ui/app/components/account-dropdowns.js index 53468a1a1..262de6601 100644 --- a/old-ui/app/components/account-dropdowns.js +++ b/old-ui/app/components/account-dropdowns.js @@ -23,9 +23,10 @@ class AccountDropdowns extends Component { renderAccounts () { const { identities, selected, keyrings } = this.props + const accountOrder = keyrings.reduce((list, keyring) => list.concat(keyring.accounts), []) - return Object.keys(identities).map((key, index) => { - const identity = identities[key] + return accountOrder.map((address, index) => { + const identity = identities[address] const isSelected = identity.address === selected const simpleAddress = identity.address.substring(2).toLowerCase() |