diff options
| author | kumavis <kumavis@users.noreply.github.com> | 2018-08-17 23:56:34 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-17 23:56:34 +0800 |
| commit | 9268c4ed548be9d44a47757a36a3f210f8de3787 (patch) | |
| tree | 63c7260de8abdf4b77d9cc6369b2d3dd4df7bd33 /ui/app/components/modals/modal.js | |
| parent | ef7e638dda63a715c796c210dadbe82430537b6a (diff) | |
| parent | d636cc35523f52f630162a1b342b5267b6cd246e (diff) | |
| download | tangerine-wallet-browser-9268c4ed548be9d44a47757a36a3f210f8de3787.tar.gz tangerine-wallet-browser-9268c4ed548be9d44a47757a36a3f210f8de3787.tar.zst tangerine-wallet-browser-9268c4ed548be9d44a47757a36a3f210f8de3787.zip | |
Merge pull request #5079 from MetaMask/v4.9.3
Version 4.9.3
Diffstat (limited to 'ui/app/components/modals/modal.js')
| -rw-r--r-- | ui/app/components/modals/modal.js | 13 |
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: [], |