aboutsummaryrefslogtreecommitdiffstats
path: root/old-ui/app/app.js
diff options
context:
space:
mode:
authorWhymarrh Whitby <whymarrh.whitby@gmail.com>2018-07-28 06:13:07 +0800
committerWhymarrh Whitby <whymarrh.whitby@gmail.com>2018-07-28 22:29:51 +0800
commit89c74ac4adf7d064e144594537d8e8ee5a0f8082 (patch)
tree37fa514011d4dd99d989dbb5d164d4470373ae19 /old-ui/app/app.js
parent6326dab1866f3dc795a74133efebb62b1bd07003 (diff)
downloadtangerine-wallet-browser-89c74ac4adf7d064e144594537d8e8ee5a0f8082.tar.gz
tangerine-wallet-browser-89c74ac4adf7d064e144594537d8e8ee5a0f8082.tar.zst
tangerine-wallet-browser-89c74ac4adf7d064e144594537d8e8ee5a0f8082.zip
Rewrite AccountQrScreen to use flexbox
The old QR screen was absolutely positioning everything which broke when the app bar resized for the new UI announcement. This change, while futile*, makes the QR screen less bad. * futile because the old UI is being deprecated
Diffstat (limited to 'old-ui/app/app.js')
-rw-r--r--old-ui/app/app.js31
1 files changed, 5 insertions, 26 deletions
diff --git a/old-ui/app/app.js b/old-ui/app/app.js
index 7f25cadbb..d3e9e823b 100644
--- a/old-ui/app/app.js
+++ b/old-ui/app/app.js
@@ -14,6 +14,7 @@ const NewKeyChainScreen = require('./new-keychain')
const UnlockScreen = require('./unlock')
// accounts
const AccountDetailScreen = require('./account-detail')
+const AccountQrScreen = require('./account-qr')
const SendTransactionScreen = require('./send')
const ConfirmTxScreen = require('./conf-tx')
// notice
@@ -28,7 +29,6 @@ const NewUiAnnouncement = require('./new-ui-annoucement')
const AppBar = require('./components/app-bar')
const Loading = require('./components/loading')
const BuyView = require('./components/buy-button-subview')
-const QrView = require('./components/qr-code')
const HDCreateVaultComplete = require('./keychains/hd/create-vault-complete')
const HDRestoreVaultScreen = require('./keychains/hd/restore-vault')
const RevealSeedConfirmation = require('./keychains/hd/recover-seed/confirmation')
@@ -262,31 +262,10 @@ App.prototype.renderPrimary = function () {
case 'qr':
log.debug('rendering show qr screen')
- return h('div', {
- style: {
- position: 'absolute',
- height: '100%',
- top: '0px',
- left: '0px',
- },
- }, [
- h('i.fa.fa-arrow-left.fa-lg.cursor-pointer.color-orange', {
- onClick: () => props.dispatch(actions.backToAccountDetail(props.selectedAddress)),
- style: {
- marginLeft: '10px',
- marginTop: '50px',
- },
- }),
- h('div', {
- style: {
- position: 'absolute',
- left: '44px',
- width: '285px',
- },
- }, [
- h(QrView, {key: 'qr'}),
- ]),
- ])
+ return h(AccountQrScreen, {
+ key: 'account-qr',
+ selectedAddress: props.selectedAddress,
+ })
default:
log.debug('rendering default, account detail screen')