diff options
| author | Dan Finlay <dan@danfinlay.com> | 2016-10-13 01:58:58 +0800 |
|---|---|---|
| committer | Dan Finlay <dan@danfinlay.com> | 2016-10-13 01:58:58 +0800 |
| commit | 535d832a64daa4d87367cd29042554f77f4e3dc2 (patch) | |
| tree | 890f2c40448d16bc07a0776349321378532e0512 /ui/app/app.js | |
| parent | ea1a934c7defe7e1b077b675ae9125118f1f3d87 (diff) | |
| parent | d67a5031c7f2b4cd14d3d27f3769a31769012f54 (diff) | |
| download | tangerine-wallet-browser-535d832a64daa4d87367cd29042554f77f4e3dc2.tar.gz tangerine-wallet-browser-535d832a64daa4d87367cd29042554f77f4e3dc2.tar.zst tangerine-wallet-browser-535d832a64daa4d87367cd29042554f77f4e3dc2.zip | |
Merge branch 'master' into i328-MultiVault
Diffstat (limited to 'ui/app/app.js')
| -rw-r--r-- | ui/app/app.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ui/app/app.js b/ui/app/app.js index d26af4e77..71e0637d0 100644 --- a/ui/app/app.js +++ b/ui/app/app.js @@ -301,7 +301,7 @@ App.prototype.renderDropdown = function () { }), h(DropMenuItem, { - label: 'Help', + label: 'Info', closeMenu: () => this.setState({ isMainMenuOpen: !isOpen }), action: () => this.props.dispatch(actions.showInfoPage()), icon: h('i.fa.fa-question.fa-lg'), @@ -330,6 +330,7 @@ App.prototype.renderBackButton = function (style, justArrow = false) { App.prototype.renderBackToInitButton = function () { var props = this.props var button = null + if (!props.isConfirmed) return button if (!props.isUnlocked) { if (props.currentView.name === 'InitMenu') { button = props.forgottenPassword ? h('.flex-row', { |