aboutsummaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorDan Finlay <dan@danfinlay.com>2017-02-14 13:25:02 +0800
committerDan Finlay <dan@danfinlay.com>2017-02-14 13:25:02 +0800
commitf2486fbdd34246619f62ff67bb3ab6e77d202f26 (patch)
tree291c60ebc060f921d3b399f02257d0d046cc8479 /app
parentb862d942097b645abe31fa2af87226e544ecd627 (diff)
downloadtangerine-wallet-browser-f2486fbdd34246619f62ff67bb3ab6e77d202f26.tar
tangerine-wallet-browser-f2486fbdd34246619f62ff67bb3ab6e77d202f26.tar.gz
tangerine-wallet-browser-f2486fbdd34246619f62ff67bb3ab6e77d202f26.tar.bz2
tangerine-wallet-browser-f2486fbdd34246619f62ff67bb3ab6e77d202f26.tar.lz
tangerine-wallet-browser-f2486fbdd34246619f62ff67bb3ab6e77d202f26.tar.xz
tangerine-wallet-browser-f2486fbdd34246619f62ff67bb3ab6e77d202f26.tar.zst
tangerine-wallet-browser-f2486fbdd34246619f62ff67bb3ab6e77d202f26.zip
got hash test passing
Diffstat (limited to 'app')
-rw-r--r--app/scripts/keyrings/hd.js4
-rw-r--r--app/scripts/keyrings/simple.js3
2 files changed, 5 insertions, 2 deletions
diff --git a/app/scripts/keyrings/hd.js b/app/scripts/keyrings/hd.js
index 7b10f925a..3a66f7868 100644
--- a/app/scripts/keyrings/hd.js
+++ b/app/scripts/keyrings/hd.js
@@ -112,9 +112,11 @@ class HdKeyring extends EventEmitter {
_getWalletForAccount (account) {
+ const targetAddress = sigUtil.normalize(account)
return this.wallets.find((w) => {
const address = w.getAddress().toString('hex')
- return ((address === account) || (sigUtil.normalize(address) === account))
+ return ((address === targetAddress) ||
+ (sigUtil.normalize(address) === targetAddress))
})
}
}
diff --git a/app/scripts/keyrings/simple.js b/app/scripts/keyrings/simple.js
index b6ffc606e..82881aa2d 100644
--- a/app/scripts/keyrings/simple.js
+++ b/app/scripts/keyrings/simple.js
@@ -88,7 +88,8 @@ class SimpleKeyring extends EventEmitter {
/* PRIVATE METHODS */
_getWalletForAccount (account) {
- let wallet = this.wallets.find(w => ethUtil.bufferToHex(w.getAddress()) === account)
+ const address = sigUtil.normalize(account)
+ let wallet = this.wallets.find(w => ethUtil.bufferToHex(w.getAddress()) === address)
if (!wallet) throw new Error('Simple Keyring - Unable to find matching address.')
return wallet
}