From 65e9d9efc56a99ecd3a46b98ed58af9604374f68 Mon Sep 17 00:00:00 2001 From: Alexander Tseung Date: Tue, 16 Jan 2018 17:41:42 -0800 Subject: [PATCH] Fix rendering QR code in old UI, hide unnecessary back button --- old-ui/app/css/index.css | 1 + ui/app/components/modals/deposit-ether-modal.js | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/old-ui/app/css/index.css b/old-ui/app/css/index.css index 4363da049..f6df3492e 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', }),