Merge pull request #4507 from whymarrh/fix-account-order

Render accounts in keyring order

10 files changed, 25 insertions, 45 deletions

diff --git a/development/states/add-token.json b/development/states/add-token.json
index 9c0f16372..84ad5dd4c 100644
--- a/development/states/add-token.json
+++ b/development/states/add-token.json
@@ -75,9 +75,9 @@
       {
         "type": "HD Key Tree",
         "accounts": [
-          "fdea65c8e26263f6d9a1b5de9555d2931a33b825",
-          "c5b8dbac4c1d3f152cdeb400e2313f309c410acb",
-          "2f8d4a878cfa04a6e60d46362f5644deab66572d"
+          "0xfdea65c8e26263f6d9a1b5de9555d2931a33b825",
+          "0xc5b8dbac4c1d3f152cdeb400e2313f309c410acb",
+          "0x2f8d4a878cfa04a6e60d46362f5644deab66572d"
         ]
       },
       {
diff --git a/development/states/confirm-sig-requests.json b/development/states/confirm-sig-requests.json
index b51003d11..3c9caafb0 100644
--- a/development/states/confirm-sig-requests.json
+++ b/development/states/confirm-sig-requests.json
@@ -115,9 +115,9 @@
       {
         "type": "HD Key Tree",
         "accounts": [
-          "fdea65c8e26263f6d9a1b5de9555d2931a33b825",
-          "c5b8dbac4c1d3f152cdeb400e2313f309c410acb",
-          "2f8d4a878cfa04a6e60d46362f5644deab66572d"
+          "0xfdea65c8e26263f6d9a1b5de9555d2931a33b825",
+          "0xc5b8dbac4c1d3f152cdeb400e2313f309c410acb",
+          "0x2f8d4a878cfa04a6e60d46362f5644deab66572d"
         ]
       },
       {
diff --git a/development/states/currency-localization.json b/development/states/currency-localization.json
index 302e24c11..8c8b18a91 100644
--- a/development/states/currency-localization.json
+++ b/development/states/currency-localization.json
@@ -76,9 +76,9 @@
       {
         "type": "HD Key Tree",
         "accounts": [
-          "fdea65c8e26263f6d9a1b5de9555d2931a33b825",
-          "c5b8dbac4c1d3f152cdeb400e2313f309c410acb",
-          "2f8d4a878cfa04a6e60d46362f5644deab66572d"
+          "0xfdea65c8e26263f6d9a1b5de9555d2931a33b825",
+          "0xc5b8dbac4c1d3f152cdeb400e2313f309c410acb",
+          "0x2f8d4a878cfa04a6e60d46362f5644deab66572d"
         ]
       },
       {
diff --git a/development/states/send-edit.json b/development/states/send-edit.json
index ae3098ecb..0d4c27116 100644
--- a/development/states/send-edit.json
+++ b/development/states/send-edit.json
@@ -94,9 +94,9 @@
       {
         "type": "HD Key Tree",
         "accounts": [
-          "fdea65c8e26263f6d9a1b5de9555d2931a33b825",
-          "c5b8dbac4c1d3f152cdeb400e2313f309c410acb",
-          "2f8d4a878cfa04a6e60d46362f5644deab66572d"
+          "0xfdea65c8e26263f6d9a1b5de9555d2931a33b825",
+          "0xc5b8dbac4c1d3f152cdeb400e2313f309c410acb",
+          "0x2f8d4a878cfa04a6e60d46362f5644deab66572d"
         ]
       },
       {
diff --git a/development/states/send-new-ui.json b/development/states/send-new-ui.json
index 1297a9139..787f8023e 100644
--- a/development/states/send-new-ui.json
+++ b/development/states/send-new-ui.json
@@ -76,9 +76,9 @@
       {
         "type": "HD Key Tree",
         "accounts": [
-          "fdea65c8e26263f6d9a1b5de9555d2931a33b825",
-          "c5b8dbac4c1d3f152cdeb400e2313f309c410acb",
-          "2f8d4a878cfa04a6e60d46362f5644deab66572d"
+          "0xfdea65c8e26263f6d9a1b5de9555d2931a33b825",
+          "0xc5b8dbac4c1d3f152cdeb400e2313f309c410acb",
+          "0x2f8d4a878cfa04a6e60d46362f5644deab66572d"
         ]
       },
       {
diff --git a/development/states/tx-list-items.json b/development/states/tx-list-items.json
index d567e3fed..ee787aaee 100644
--- a/development/states/tx-list-items.json
+++ b/development/states/tx-list-items.json
@@ -83,9 +83,9 @@
       {
         "type": "HD Key Tree",
         "accounts": [
-          "fdea65c8e26263f6d9a1b5de9555d2931a33b825",
-          "c5b8dbac4c1d3f152cdeb400e2313f309c410acb",
-          "2f8d4a878cfa04a6e60d46362f5644deab66572d"
+          "0xfdea65c8e26263f6d9a1b5de9555d2931a33b825",
+          "0xc5b8dbac4c1d3f152cdeb400e2313f309c410acb",
+          "0x2f8d4a878cfa04a6e60d46362f5644deab66572d"
         ]
       },
       {
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()
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()
 
diff --git a/ui/app/reducers.js b/ui/app/reducers.js
index f155b2bf3..e3a3077d9 100644
--- a/ui/app/reducers.js
+++ b/ui/app/reducers.js
@@ -4,7 +4,6 @@ const copyToClipboard = require('copy-to-clipboard')
 //
 // Sub-Reducers take in the complete state and return their sub-state
 //
-const reduceIdentities = require('./reducers/identities')
 const reduceMetamask = require('./reducers/metamask')
 const reduceApp = require('./reducers/app')
 const reduceLocale = require('./reducers/locale')
@@ -22,12 +21,6 @@ function rootReducer (state, action) {
   }
 
   //
-  // Identities
-  //
-
-  state.identities = reduceIdentities(state, action)
-
-  //
   // MetaMask
   //
 
diff --git a/ui/app/reducers/identities.js b/ui/app/reducers/identities.js
deleted file mode 100644
index 341a404e7..000000000
--- a/ui/app/reducers/identities.js
+++ /dev/null
@@ -1,15 +0,0 @@
-const extend = require('xtend')
-
-module.exports = reduceIdentities
-
-function reduceIdentities (state, action) {
-  // clone + defaults
-  var idState = extend({
-
-  }, state.identities)
-
-  switch (action.type) {
-    default:
-      return idState
-  }
-}