diff options
| author | Chi Kei Chan <chikeichan@gmail.com> | 2018-01-18 05:49:48 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-18 05:49:48 +0800 |
| commit | ba0762c582be7bdb3706f66300bc3d6a5c832836 (patch) | |
| tree | 843f5931467183dd5a8e4fb11afd3b2eb1f46780 | |
| parent | b80ed2c451fee7b94edea9d1655baa2e908939b9 (diff) | |
| parent | 65e9d9efc56a99ecd3a46b98ed58af9604374f68 (diff) | |
| download | tangerine-wallet-browser-ba0762c582be7bdb3706f66300bc3d6a5c832836.tar tangerine-wallet-browser-ba0762c582be7bdb3706f66300bc3d6a5c832836.tar.gz tangerine-wallet-browser-ba0762c582be7bdb3706f66300bc3d6a5c832836.tar.bz2 tangerine-wallet-browser-ba0762c582be7bdb3706f66300bc3d6a5c832836.tar.lz tangerine-wallet-browser-ba0762c582be7bdb3706f66300bc3d6a5c832836.tar.xz tangerine-wallet-browser-ba0762c582be7bdb3706f66300bc3d6a5c832836.tar.zst tangerine-wallet-browser-ba0762c582be7bdb3706f66300bc3d6a5c832836.zip | |
Merge pull request #3005 from alextsg/cb-385
[NewUI] Fix rendering QR code in full screen old UI, hide unnecessary back button
| -rw-r--r-- | old-ui/app/css/index.css | 1 | ||||
| -rw-r--r-- | ui/app/components/modals/deposit-ether-modal.js | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/old-ui/app/css/index.css b/old-ui/app/css/index.css index 02b5b82a4..3bb64647a 100644 --- a/old-ui/app/css/index.css +++ b/old-ui/app/css/index.css @@ -21,6 +21,7 @@ html, body { background: #F7F7F7; margin: 0; padding: 0; + height: 100%; } html { diff --git a/ui/app/components/modals/deposit-ether-modal.js b/ui/app/components/modals/deposit-ether-modal.js index 3e6d3fde1..532d66653 100644 --- a/ui/app/components/modals/deposit-ether-modal.js +++ b/ui/app/components/modals/deposit-ether-modal.js @@ -62,6 +62,7 @@ DepositEtherModal.prototype.renderRow = function ({ hideButton, hideTitle, onBackClick, + showBackButton, }) { if (hide) { return null @@ -71,7 +72,7 @@ DepositEtherModal.prototype.renderRow = function ({ className: className || 'deposit-ether-modal__buy-row', }, [ - h('div.deposit-ether-modal__buy-row__back', { + onBackClick && showBackButton && h('div.deposit-ether-modal__buy-row__back', { onClick: onBackClick, }, [ @@ -167,6 +168,7 @@ DepositEtherModal.prototype.render = function () { hideButton: buyingWithShapeshift, hideTitle: buyingWithShapeshift, onBackClick: () => this.setState({ buyingWithShapeshift: false }), + showBackButton: this.state.buyingWithShapeshift, className: buyingWithShapeshift && 'deposit-ether-modal__buy-row__shapeshift-buy', }), |