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.js12
1 files changed, 7 insertions, 5 deletions
diff --git a/ui/app/app.js b/ui/app/app.js
index bfa8d8aa7..4e6da24c3 100644
--- a/ui/app/app.js
+++ b/ui/app/app.js
@@ -90,6 +90,7 @@ function mapStateToProps (state) {
isMouseUser: state.appState.isMouseUser,
betaUI: state.metamask.featureFlags.betaUI,
isRevealingSeedWords: state.metamask.isRevealingSeedWords,
+ Qr: state.appState.Qr,
// state needed to get account dropdown temporarily rendering from app bar
identities,
@@ -287,10 +288,10 @@ App.prototype.renderAppBar = function () {
}),
// metamask name
- h('h1', 'MetaMask'),
-
- h('div.beta-label', 'BETA'),
-
+ h('.flex-row', [
+ h('h1', 'MetaMask'),
+ h('div.beta-label', 'BETA'),
+ ]),
]),
h('div.header__right-actions', [
@@ -368,6 +369,7 @@ App.prototype.renderPrimary = function () {
isOnboarding,
betaUI,
isRevealingSeedWords,
+ Qr,
} = props
const isMascaraOnboarding = isMascara && isOnboarding
const isBetaUIOnboarding = betaUI && isOnboarding && !props.isPopup && !isRevealingSeedWords
@@ -508,7 +510,7 @@ App.prototype.renderPrimary = function () {
width: '285px',
},
}, [
- h(QrView, {key: 'qr'}),
+ h(QrView, {key: 'qr', Qr}),
]),
])