From 523cf9ad33d88719520ae5e7293329d133b64d4d Mon Sep 17 00:00:00 2001
From: brunobar79 <brunobar79@gmail.com>
Date: Wed, 11 Jul 2018 00:20:40 -0400
Subject: account removal is working

---
 app/scripts/controllers/preferences.js | 24 ++++++++++++++++++++++++
 app/scripts/metamask-controller.js     | 16 +++++++++++++++-
 2 files changed, 39 insertions(+), 1 deletion(-)

(limited to 'app/scripts')

diff --git a/app/scripts/controllers/preferences.js b/app/scripts/controllers/preferences.js
index b314745f5..f6250dc16 100644
--- a/app/scripts/controllers/preferences.js
+++ b/app/scripts/controllers/preferences.js
@@ -85,6 +85,30 @@ class PreferencesController {
     this.store.updateState({ identities })
   }
 
+  /**
+   * Removes an address from state
+   *
+   * @param {string} address A hex address
+   * @returns {string} the address that was removed
+   */
+  removeAddress (address) {
+    const identities = this.store.getState().identities
+    if (!identities[address]) {
+      throw new Error(`${address} can't be deleted cause it was not found`)
+    }
+    delete identities[address]
+    this.store.updateState({ identities })
+
+    // If the selected account is no longer valid,
+    // select an arbitrary other account:
+    if (address === this.getSelectedAddress()) {
+      const selected = Object.keys(identities)[0]
+      this.setSelectedAddress(selected)
+    }
+    return address
+  }
+
+
   /**
    * Adds addresses to the identities object without removing identities
    *
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index bec02c3ed..e8f0eba90 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -354,6 +354,7 @@ module.exports = class MetamaskController extends EventEmitter {
       verifySeedPhrase: nodeify(this.verifySeedPhrase, this),
       clearSeedWordCache: this.clearSeedWordCache.bind(this),
       resetAccount: nodeify(this.resetAccount, this),
+      removeAccount: nodeify(this.removeAccount, this),
       importAccountWithStrategy: nodeify(this.importAccountWithStrategy, this),
 
       // trezor
@@ -587,7 +588,8 @@ module.exports = class MetamaskController extends EventEmitter {
       }
     })
 
-    this.preferencesController.setAccountLabel(trezorAccount, `TREZOR #${index + 1}`)
+    this.preferencesController.setAccountLabel(trezorAccount, `TREZOR #${parseInt(index, 10) + 1}`)
+    this.preferencesController.setSelectedAddress(trezorAccount)
     const { identities } = this.preferencesController.store.getState()
     return { ...keyState, identities }
    }
@@ -705,6 +707,18 @@ module.exports = class MetamaskController extends EventEmitter {
     return selectedAddress
   }
 
+  /**
+   * Removes a "Loose" account from state.
+   *
+   * @param {string[]} address A hex address
+   *
+   */
+  async removeAccount (address) {
+    this.preferencesController.removeAddress(address)
+    return address
+  }
+
+
   /**
    * Imports an account with the specified import strategy.
    * These are defined in app/scripts/account-import-strategies
-- 
cgit