diff options
| author | Dan Finlay <dan@danfinlay.com> | 2018-03-07 06:59:09 +0800 |
|---|---|---|
| committer | Dan Finlay <dan@danfinlay.com> | 2018-03-07 06:59:09 +0800 |
| commit | 423f084cb47d84e2e9063a6567454f83592f424b (patch) | |
| tree | bc2f3040cd76765fa27bbfc0e3913cf5e466c063 /ui/app/components/buy-button-subview.js | |
| parent | 8ba64c657ff801425c06db166e2c9a06289047de (diff) | |
| parent | 303801d2768a264a27a51916e5debf778739ee0c (diff) | |
| download | tangerine-wallet-browser-423f084cb47d84e2e9063a6567454f83592f424b.tar.gz tangerine-wallet-browser-423f084cb47d84e2e9063a6567454f83592f424b.tar.zst tangerine-wallet-browser-423f084cb47d84e2e9063a6567454f83592f424b.zip | |
Merge branch 'master' into i3076-UseStorageLocalInstead
Diffstat (limited to 'ui/app/components/buy-button-subview.js')
| -rw-r--r-- | ui/app/components/buy-button-subview.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ui/app/components/buy-button-subview.js b/ui/app/components/buy-button-subview.js index 15281171c..d5958787b 100644 --- a/ui/app/components/buy-button-subview.js +++ b/ui/app/components/buy-button-subview.js @@ -76,7 +76,7 @@ BuyButtonSubview.prototype.headerSubview = function () { paddingTop: '4px', paddingBottom: '4px', }, - }, 'Buy Eth'), + }, 'Deposit Eth'), ]), // loading indication @@ -87,7 +87,7 @@ BuyButtonSubview.prototype.headerSubview = function () { left: '49vw', }, }, [ - h(Loading, { isLoading }), + isLoading && h(Loading), ]), // account panel @@ -245,7 +245,7 @@ BuyButtonSubview.prototype.navigateTo = function (url) { BuyButtonSubview.prototype.backButtonContext = function () { if (this.props.context === 'confTx') { - this.props.dispatch(actions.showConfTxPage(false)) + this.props.dispatch(actions.showConfTxPage({transForward: false})) } else { this.props.dispatch(actions.goHome()) } |