aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/app.js
diff options
context:
space:
mode:
authorDan Finlay <dan@danfinlay.com>2016-10-12 07:13:53 +0800
committerDan Finlay <dan@danfinlay.com>2016-10-12 07:13:53 +0800
commit5d01d50c16490c025addab4fc2461495ca9d0a5f (patch)
tree2a4579690d7ba410adea51b605f7aa724d4edf84 /ui/app/app.js
parente1ece0f0e3bb53501409e5f8b3f5d904040ac2e8 (diff)
parentbbaf79f576443f6325d6c32d119f020a61bffa67 (diff)
downloadtangerine-wallet-browser-5d01d50c16490c025addab4fc2461495ca9d0a5f.tar
tangerine-wallet-browser-5d01d50c16490c025addab4fc2461495ca9d0a5f.tar.gz
tangerine-wallet-browser-5d01d50c16490c025addab4fc2461495ca9d0a5f.tar.bz2
tangerine-wallet-browser-5d01d50c16490c025addab4fc2461495ca9d0a5f.tar.lz
tangerine-wallet-browser-5d01d50c16490c025addab4fc2461495ca9d0a5f.tar.xz
tangerine-wallet-browser-5d01d50c16490c025addab4fc2461495ca9d0a5f.tar.zst
tangerine-wallet-browser-5d01d50c16490c025addab4fc2461495ca9d0a5f.zip
Merge branch 'master' into i721-ScrollAccountList
Diffstat (limited to 'ui/app/app.js')
-rw-r--r--ui/app/app.js3
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', {