diff options
| author | Dan Finlay <somniac@me.com> | 2016-09-14 03:53:28 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-14 03:53:28 +0800 |
| commit | 194f1724f36fb6d964513aa7b364b0835af5d93d (patch) | |
| tree | f3b56d97a1282a699458b09977dd2832da29d4e5 /ui/app/components/qr-code.js | |
| parent | 31e5165cae19716b40bdff086f912dcfebe6365d (diff) | |
| parent | 3b2182f576948e4ab57d23c2161227178f5dc20c (diff) | |
| download | tangerine-wallet-browser-194f1724f36fb6d964513aa7b364b0835af5d93d.tar.gz tangerine-wallet-browser-194f1724f36fb6d964513aa7b364b0835af5d93d.tar.zst tangerine-wallet-browser-194f1724f36fb6d964513aa7b364b0835af5d93d.zip | |
Merge branch 'master' into i646-ClosePopupBug
Diffstat (limited to 'ui/app/components/qr-code.js')
| -rw-r--r-- | ui/app/components/qr-code.js | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/ui/app/components/qr-code.js b/ui/app/components/qr-code.js index c26b02b94..5488599eb 100644 --- a/ui/app/components/qr-code.js +++ b/ui/app/components/qr-code.js @@ -1,5 +1,6 @@ const Component = require('react').Component const h = require('react-hyperscript') +const qrCode = require('qrcode-npm').qrcode const inherits = require('util').inherits const connect = require('react-redux').connect const CopyButton = require('./copyButton') @@ -23,15 +24,22 @@ function QrCodeView () { QrCodeView.prototype.render = function () { var props = this.props var Qr = props.Qr + var qrImage = qrCode(4, 'M') + + qrImage.addData(Qr.data) + qrImage.make() + return h('.main-container.flex-column', { key: 'qr', style: { justifyContent: 'center', - padding: '45px', + paddingBottom: '45px', + paddingLeft: '45px', + paddingRight: '45px', alignItems: 'center', }, }, [ - Array.isArray(Qr.message) ? h('.message-container', this.renderMultiMessage()) : h('h3', Qr.message), + Array.isArray(Qr.message) ? h('.message-container', this.renderMultiMessage()) : h('.qr-header', Qr.message), this.props.warning ? this.props.warning && h('span.error.flex-center', { style: { @@ -48,7 +56,7 @@ QrCodeView.prototype.render = function () { marginBottom: '15px', }, dangerouslySetInnerHTML: { - __html: Qr.image, + __html: qrImage.createTableTag(4), }, }), h('.flex-row', [ |