aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/app.js
diff options
context:
space:
mode:
Diffstat (limited to 'ui/app/app.js')
-rw-r--r--ui/app/app.js7
1 files changed, 7 insertions, 0 deletions
diff --git a/ui/app/app.js b/ui/app/app.js
index dbb6146d1..9363d21d1 100644
--- a/ui/app/app.js
+++ b/ui/app/app.js
@@ -39,6 +39,8 @@ const Modal = require('./components/modals/index').Modal
// Global Alert
const Alert = require('./components/alert')
+const QrScanner = require('./components/qr-scanner')
+
const AppHeader = require('./components/app-header')
import UnlockPage from './components/pages/unlock-page'
@@ -132,6 +134,8 @@ class App extends Component {
// global alert
h(Alert, {visible: this.props.alertOpen, msg: alertMessage}),
+ h(QrScanner, {visible: this.props.qrScannerOpen}),
+
h(AppHeader),
// sidebar
@@ -270,6 +274,7 @@ App.propTypes = {
currentView: PropTypes.object,
sidebarOpen: PropTypes.bool,
alertOpen: PropTypes.bool,
+ qrScannerOpen: PropTypes.bool,
hideSidebar: PropTypes.func,
isMascara: PropTypes.bool,
isOnboarding: PropTypes.bool,
@@ -306,6 +311,7 @@ function mapStateToProps (state) {
networkDropdownOpen,
sidebarOpen,
alertOpen,
+ qrScannerOpen,
alertMessage,
isLoading,
loadingMessage,
@@ -333,6 +339,7 @@ function mapStateToProps (state) {
networkDropdownOpen,
sidebarOpen,
alertOpen,
+ qrScannerOpen,
alertMessage,
isLoading,
loadingMessage,