aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/app.js
diff options
context:
space:
mode:
authorFrankie <frankie.pangilinan@consensys.net>2016-08-19 01:40:35 +0800
committerFrankie <frankie.pangilinan@consensys.net>2016-08-19 02:04:28 +0800
commit752d16f6c072b0dd54eb245209881a25ff06cb8e (patch)
tree942ce682425b2811c5143028d842e02095712c46 /ui/app/app.js
parent9b1a3fd7f36adfacd46de78f4f60e26eca6edd16 (diff)
downloadtangerine-wallet-browser-752d16f6c072b0dd54eb245209881a25ff06cb8e.tar
tangerine-wallet-browser-752d16f6c072b0dd54eb245209881a25ff06cb8e.tar.gz
tangerine-wallet-browser-752d16f6c072b0dd54eb245209881a25ff06cb8e.tar.bz2
tangerine-wallet-browser-752d16f6c072b0dd54eb245209881a25ff06cb8e.tar.lz
tangerine-wallet-browser-752d16f6c072b0dd54eb245209881a25ff06cb8e.tar.xz
tangerine-wallet-browser-752d16f6c072b0dd54eb245209881a25ff06cb8e.tar.zst
tangerine-wallet-browser-752d16f6c072b0dd54eb245209881a25ff06cb8e.zip
WIP: ShapeShift tx
Diffstat (limited to 'ui/app/app.js')
-rw-r--r--ui/app/app.js28
1 files changed, 28 insertions, 0 deletions
diff --git a/ui/app/app.js b/ui/app/app.js
index 2d8b46ce8..84ff16ec8 100644
--- a/ui/app/app.js
+++ b/ui/app/app.js
@@ -29,6 +29,7 @@ const NetworkIndicator = require('./components/network')
const Tooltip = require('./components/tooltip')
const EthStoreWarning = require('./eth-store-warning')
const BuyView = require('./components/buy-button-subview')
+const QrView = require('./components/qr-code')
module.exports = connect(mapStateToProps)(App)
inherits(App, Component)
@@ -359,6 +360,33 @@ App.prototype.renderPrimary = function () {
return h(CreateVaultScreen, {key: 'createVault'})
case 'buyEth':
return h(BuyView, {key: 'buyEthView'})
+ case 'qr':
+ 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.activeAddress)),
+ style: {
+ marginLeft: '10px',
+ marginTop: '50px',
+ },
+ }),
+ h('div', {
+ style: {
+ position: 'absolute',
+ bottom: '115px',
+ left: '44px',
+ width: '285px',
+ },
+ }, [
+ h(QrView, {key: 'qr'}),
+ ]),
+ ])
default:
return h(AccountDetailScreen, {key: 'account-detail'})