aboutsummaryrefslogtreecommitdiffstats
path: root/app/scripts/inpage.js
diff options
context:
space:
mode:
authorDan Finlay <dan@danfinlay.com>2016-11-23 07:36:50 +0800
committerDan Finlay <dan@danfinlay.com>2016-11-23 07:36:50 +0800
commit2966d46fa29641ad478cc83b5ee4c6c8adf1c63b (patch)
tree6f2e4e3fffa6728d29482e2c475273b4510ac880 /app/scripts/inpage.js
parent136296aad6058c4bea8c3083e8ae553b2afcab98 (diff)
parentc8176c9439cebf2cf65efbc73a633f8e1b643128 (diff)
downloadtangerine-wallet-browser-2966d46fa29641ad478cc83b5ee4c6c8adf1c63b.tar
tangerine-wallet-browser-2966d46fa29641ad478cc83b5ee4c6c8adf1c63b.tar.gz
tangerine-wallet-browser-2966d46fa29641ad478cc83b5ee4c6c8adf1c63b.tar.bz2
tangerine-wallet-browser-2966d46fa29641ad478cc83b5ee4c6c8adf1c63b.tar.lz
tangerine-wallet-browser-2966d46fa29641ad478cc83b5ee4c6c8adf1c63b.tar.xz
tangerine-wallet-browser-2966d46fa29641ad478cc83b5ee4c6c8adf1c63b.tar.zst
tangerine-wallet-browser-2966d46fa29641ad478cc83b5ee4c6c8adf1c63b.zip
Merge branch 'dev' into i843-MoveSaltIntoEncryptor
Diffstat (limited to 'app/scripts/inpage.js')
-rw-r--r--app/scripts/inpage.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/scripts/inpage.js b/app/scripts/inpage.js
index 9d6fc96de..68c6165c8 100644
--- a/app/scripts/inpage.js
+++ b/app/scripts/inpage.js
@@ -50,7 +50,7 @@ endOfStream(pingStream, triggerReload)
// set web3 defaultAcount
inpageProvider.publicConfigStore.subscribe(function (state) {
- web3.eth.defaultAccount = state.selectedAddress
+ web3.eth.defaultAccount = state.selectedAccount
})
//