aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/first-time
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 /ui/app/first-time
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 'ui/app/first-time')
-rw-r--r--ui/app/first-time/init-menu.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/ui/app/first-time/init-menu.js b/ui/app/first-time/init-menu.js
index 14a89b988..6ceee6784 100644
--- a/ui/app/first-time/init-menu.js
+++ b/ui/app/first-time/init-menu.js
@@ -165,7 +165,7 @@ InitializeMenuScreen.prototype.createNewVaultAndKeychain = function () {
return
}
- this.props.dispatch(actions.createNewVaultAndKeychain(password, ''/* entropy*/))
+ this.props.dispatch(actions.createNewVaultAndKeychain(password))
}
InitializeMenuScreen.prototype.inputChanged = function (event) {