diff options
author | Dan Finlay <dan@danfinlay.com> | 2017-01-18 05:58:54 +0800 |
---|---|---|
committer | Dan Finlay <dan@danfinlay.com> | 2017-01-18 05:58:54 +0800 |
commit | 958cbfbde44c201cf71f5dfcb7b1748bb43e597f (patch) | |
tree | 17949bcdd27172541ff374d8b8bf44ccd570af92 /ui/app/app.js | |
parent | 77bd010543855fafe21ac37e282bc8137ef7a7d8 (diff) | |
parent | b3cb675a8bd406bd16aa74ff209032075f9b31d7 (diff) | |
download | tangerine-wallet-browser-958cbfbde44c201cf71f5dfcb7b1748bb43e597f.tar.gz tangerine-wallet-browser-958cbfbde44c201cf71f5dfcb7b1748bb43e597f.tar.zst tangerine-wallet-browser-958cbfbde44c201cf71f5dfcb7b1748bb43e597f.zip |
Merge branch 'i328-MultiVault-v1' into i715-AddImportMenu
Diffstat (limited to 'ui/app/app.js')
-rw-r--r-- | ui/app/app.js | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/ui/app/app.js b/ui/app/app.js index c6377a2cf..67c78b31c 100644 --- a/ui/app/app.js +++ b/ui/app/app.js @@ -20,7 +20,7 @@ const NoticeScreen = require('./components/notice') const generateLostAccountsNotice = require('../lib/lost-accounts-notice') // other views const ConfigScreen = require('./config') -const Import = require('./import') +const Import = require('./accounts/import') const InfoScreen = require('./info') const LoadingIndicator = require('./components/loading') const SandwichExpando = require('sandwich-expando') @@ -33,6 +33,7 @@ const QrView = require('./components/qr-code') const HDCreateVaultComplete = require('./keychains/hd/create-vault-complete') const HDRestoreVaultScreen = require('./keychains/hd/restore-vault') const RevealSeedConfirmation = require('./keychains/hd/recover-seed/confirmation') +const AddAccountScreen = require('./accounts/add') module.exports = connect(mapStateToProps)(App) @@ -407,6 +408,9 @@ App.prototype.renderPrimary = function () { case 'accountDetail': return h(AccountDetailScreen, {key: 'account-detail'}) + case 'new-account': + return h(AddAccountScreen, {key: 'new-account'}) + case 'sendTransaction': return h(SendTransactionScreen, {key: 'send-transaction'}) |