aboutsummaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorFrankie <frankie.diamond@gmail.com>2017-01-12 08:07:03 +0800
committerGitHub <noreply@github.com>2017-01-12 08:07:03 +0800
commitf9efb0817d884fee22817c9a622e6583ef08e5da (patch)
tree3b575d83c0d8a6ce05507b3c9d7495d5b44a51aa /app
parent576e2ad64df293adcc8c2494a3648100ba4b28f5 (diff)
parentb23a24f61da808825975722e5493644856680daf (diff)
downloadtangerine-wallet-browser-f9efb0817d884fee22817c9a622e6583ef08e5da.tar
tangerine-wallet-browser-f9efb0817d884fee22817c9a622e6583ef08e5da.tar.gz
tangerine-wallet-browser-f9efb0817d884fee22817c9a622e6583ef08e5da.tar.bz2
tangerine-wallet-browser-f9efb0817d884fee22817c9a622e6583ef08e5da.tar.lz
tangerine-wallet-browser-f9efb0817d884fee22817c9a622e6583ef08e5da.tar.xz
tangerine-wallet-browser-f9efb0817d884fee22817c9a622e6583ef08e5da.tar.zst
tangerine-wallet-browser-f9efb0817d884fee22817c9a622e6583ef08e5da.zip
Merge branch 'dev' into integrateTxManagerUI
Diffstat (limited to 'app')
-rw-r--r--app/scripts/keyring-controller.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/scripts/keyring-controller.js b/app/scripts/keyring-controller.js
index 81e6a4905..2b4515e79 100644
--- a/app/scripts/keyring-controller.js
+++ b/app/scripts/keyring-controller.js
@@ -272,7 +272,7 @@ module.exports = class KeyringController extends EventEmitter {
setSelectedAccount (address) {
var addr = normalize(address)
this.configManager.setSelectedAccount(addr)
- return Promise.resolve(addr)
+ return this.fullUpdate()
}
// Save Account Label