diff options
| author | kumavis <kumavis@users.noreply.github.com> | 2016-10-13 04:03:15 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-13 04:03:15 +0800 |
| commit | 88a68f732ee068d5f230708927207e3f84c43ad0 (patch) | |
| tree | 5d0b967a582a7ef6e189834fccba5ede7e73101e /ui/app/app.js | |
| parent | a1c3c944cf534fff8bfb9560347a03ba2a2bda00 (diff) | |
| parent | d67a5031c7f2b4cd14d3d27f3769a31769012f54 (diff) | |
| download | tangerine-wallet-browser-88a68f732ee068d5f230708927207e3f84c43ad0.tar tangerine-wallet-browser-88a68f732ee068d5f230708927207e3f84c43ad0.tar.gz tangerine-wallet-browser-88a68f732ee068d5f230708927207e3f84c43ad0.tar.bz2 tangerine-wallet-browser-88a68f732ee068d5f230708927207e3f84c43ad0.tar.lz tangerine-wallet-browser-88a68f732ee068d5f230708927207e3f84c43ad0.tar.xz tangerine-wallet-browser-88a68f732ee068d5f230708927207e3f84c43ad0.tar.zst tangerine-wallet-browser-88a68f732ee068d5f230708927207e3f84c43ad0.zip | |
Merge branch 'master' into i695-dapp-reload
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', { |