diff options
| author | Alexander Tseung <alextsg@gmail.com> | 2017-12-23 03:00:46 +0800 |
|---|---|---|
| committer | Alexander Tseung <alextsg@gmail.com> | 2017-12-23 03:00:46 +0800 |
| commit | 06410381d4b738fe22aa24973c7f9568d295f570 (patch) | |
| tree | 69bd8701cdaa417cb6c0f46deff43414122101db /ui/app/components/buy-button-subview.js | |
| parent | 06f496310ce7d719bbb5690f307db143ba57a1a7 (diff) | |
| parent | a218008adf85dfb5fa8ca93c789e14d9f2090813 (diff) | |
| download | tangerine-wallet-browser-06410381d4b738fe22aa24973c7f9568d295f570.tar.gz tangerine-wallet-browser-06410381d4b738fe22aa24973c7f9568d295f570.tar.zst tangerine-wallet-browser-06410381d4b738fe22aa24973c7f9568d295f570.zip | |
Merge branch 'NewUI-flat' into merge-master
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()) } |