aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/components/modals/modal.js
diff options
context:
space:
mode:
authorBruno Barbieri <bruno.barbieri@consensys.net>2018-08-11 01:40:06 +0800
committerGitHub <noreply@github.com>2018-08-11 01:40:06 +0800
commite2be22a4b722df608cb764042cc8ade6664414d8 (patch)
tree6a0c48ea06401ea8e06c14630edc7c0157f6e25c /ui/app/components/modals/modal.js
parentbe1d5a7dd959f061b52f475bf8500b943ade786c (diff)
parentd0ccc59e459ecb41742b6e55a1875dfa2a2f9f87 (diff)
downloadtangerine-wallet-browser-e2be22a4b722df608cb764042cc8ade6664414d8.tar
tangerine-wallet-browser-e2be22a4b722df608cb764042cc8ade6664414d8.tar.gz
tangerine-wallet-browser-e2be22a4b722df608cb764042cc8ade6664414d8.tar.bz2
tangerine-wallet-browser-e2be22a4b722df608cb764042cc8ade6664414d8.tar.lz
tangerine-wallet-browser-e2be22a4b722df608cb764042cc8ade6664414d8.tar.xz
tangerine-wallet-browser-e2be22a4b722df608cb764042cc8ade6664414d8.tar.zst
tangerine-wallet-browser-e2be22a4b722df608cb764042cc8ade6664414d8.zip
Merge pull request #4897 from MetaMask/qr-code-scan
QR Code Scanner
Diffstat (limited to 'ui/app/components/modals/modal.js')
-rw-r--r--ui/app/components/modals/modal.js13
1 files changed, 13 insertions, 0 deletions
diff --git a/ui/app/components/modals/modal.js b/ui/app/components/modals/modal.js
index f59825ed1..5dda50e52 100644
--- a/ui/app/components/modals/modal.js
+++ b/ui/app/components/modals/modal.js
@@ -21,6 +21,7 @@ const CustomizeGasModal = require('../customize-gas-modal')
const NotifcationModal = require('./notification-modal')
const ConfirmResetAccount = require('./confirm-reset-account')
const ConfirmRemoveAccount = require('./confirm-remove-account')
+const QRScanner = require('./qr-scanner')
const TransactionConfirmed = require('./transaction-confirmed')
const WelcomeBeta = require('./welcome-beta')
const Notification = require('./notification')
@@ -346,6 +347,18 @@ const MODALS = {
borderRadius: '8px',
},
},
+ QR_SCANNER: {
+ contents: h(QRScanner),
+ mobileModalStyle: {
+ ...modalContainerMobileStyle,
+ },
+ laptopModalStyle: {
+ ...modalContainerLaptopStyle,
+ },
+ contentStyle: {
+ borderRadius: '8px',
+ },
+ },
DEFAULT: {
contents: [],