diff options
| author | Frankie <frankie.diamond@gmail.com> | 2016-10-12 07:19:13 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-12 07:19:13 +0800 |
| commit | 229d95956bc36ec413533df00389f8c5127e050b (patch) | |
| tree | b97f0021958fbcf8ed93ac9c44e3d24eaf50f4e4 /ui/app/app.js | |
| parent | 97970e803d55fc8a578a3a9e6d6f3ab19c332b4b (diff) | |
| parent | d67a5031c7f2b4cd14d3d27f3769a31769012f54 (diff) | |
| download | tangerine-wallet-browser-229d95956bc36ec413533df00389f8c5127e050b.tar tangerine-wallet-browser-229d95956bc36ec413533df00389f8c5127e050b.tar.gz tangerine-wallet-browser-229d95956bc36ec413533df00389f8c5127e050b.tar.bz2 tangerine-wallet-browser-229d95956bc36ec413533df00389f8c5127e050b.tar.lz tangerine-wallet-browser-229d95956bc36ec413533df00389f8c5127e050b.tar.xz tangerine-wallet-browser-229d95956bc36ec413533df00389f8c5127e050b.tar.zst tangerine-wallet-browser-229d95956bc36ec413533df00389f8c5127e050b.zip | |
Merge branch 'master' into i#495CustomGasField
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', { |