aboutsummaryrefslogtreecommitdiffstats
path: root/old-ui/app/components/account-dropdowns.js
diff options
context:
space:
mode:
authorPhyrexTsai <x01ep23i@hotmail.com>2018-07-04 09:06:10 +0800
committerGitHub <noreply@github.com>2018-07-04 09:06:10 +0800
commitf38dc03b27a457733315cbb16d59d0ea339505da (patch)
tree77cfdf13c0e83c8e6d87099bfedddc3d58667de1 /old-ui/app/components/account-dropdowns.js
parent11736e6318182ab5b43430410a46059e5f46ad52 (diff)
parent13b03ec090df70512d43e0d6acbe6bf60040a892 (diff)
downloadtangerine-wallet-browser-f38dc03b27a457733315cbb16d59d0ea339505da.tar
tangerine-wallet-browser-f38dc03b27a457733315cbb16d59d0ea339505da.tar.gz
tangerine-wallet-browser-f38dc03b27a457733315cbb16d59d0ea339505da.tar.bz2
tangerine-wallet-browser-f38dc03b27a457733315cbb16d59d0ea339505da.tar.lz
tangerine-wallet-browser-f38dc03b27a457733315cbb16d59d0ea339505da.tar.xz
tangerine-wallet-browser-f38dc03b27a457733315cbb16d59d0ea339505da.tar.zst
tangerine-wallet-browser-f38dc03b27a457733315cbb16d59d0ea339505da.zip
Merge pull request #4 from brunobar79/portal-metamask-lint-fix
Lint fix for Integration ENS with IPFS
Diffstat (limited to 'old-ui/app/components/account-dropdowns.js')
-rw-r--r--old-ui/app/components/account-dropdowns.js5
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()