m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-22 09:23:21 +01:00
Code

[NewUI] Adds the mascara first time flow to betaUI extension (#3257)

Browse Source 
* Adds the mascara first time flow to the extension when opened in browser.

* Fix tests after addition of mascara first time flow to new ui.
This commit is contained in:
Dan J Miller 2018-02-16 06:15:09 -03:30 committed by GitHub
parent 77259ef5be
commit 170c7602b7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
development/states/first-time.json
View File

@ -8,7 +8,7 @@
"frequentRpcList": [],
"unapprovedTxs": {},
"currentCurrency": "USD",
"featureFlags": {"betaUI": true},
"featureFlags": {"betaUI": false},
"conversionRate": 12.7527416,
"conversionDate": 1487624341,
"noActiveNotices": false,

3
test/integration/lib/first-time.js
View File

@ -22,7 +22,6 @@ async function runFirstTimeUsageTest(assert, done) {
reactTriggerChange(selectState[0])
await timeout(2000)
const app = $('#app-content')
// recurse notices
@ -46,7 +45,7 @@ async function runFirstTimeUsageTest(assert, done) {
await timeout()
// Scroll through terms
const title = app.find('h1')[1]
const title = app.find('h1')[0]
assert.equal(title.textContent, 'MetaMask', 'title screen')
// enter password

10
ui/app/app.js
View File

@ -9,7 +9,7 @@ const classnames = require('classnames')
const MascaraFirstTime = require('../../mascara/src/app/first-time').default
const MascaraBuyEtherScreen = require('../../mascara/src/app/first-time/buy-ether-screen').default
// init
const InitializeMenuScreen = require('./first-time/init-menu')
const InitializeMenuScreen = MascaraFirstTime
const NewKeyChainScreen = require('./new-keychain')
// accounts
const MainContainer = require('./main-container')
@ -74,6 +74,7 @@ function mapStateToProps (state) {
transForward: state.appState.transForward,
isMascara: state.metamask.isMascara,
isOnboarding: Boolean(!noActiveNotices || seedWords || !isInitialized),
isPopup: state.metamask.isPopup,
seedWords: state.metamask.seedWords,
unapprovedTxs: state.metamask.unapprovedTxs,
unapprovedMsgs: state.metamask.unapprovedMsgs,
@ -85,7 +86,8 @@ function mapStateToProps (state) {
lostAccounts: state.metamask.lostAccounts,
frequentRpcList: state.metamask.frequentRpcList || [],
currentCurrency: state.metamask.currentCurrency,
isMouseUser: state.appState.isMouseUser,
isMouseUser: state.appState.isMouseUser,
betaUI: state.metamask.featureFlags.betaUI,
// state needed to get account dropdown temporarily rendering from app bar
identities,
@ -351,9 +353,9 @@ App.prototype.renderBackButton = function (style, justArrow = false) {
App.prototype.renderPrimary = function () {
log.debug('rendering primary')
var props = this.props
const {isMascara, isOnboarding} = props
const {isMascara, isOnboarding, betaUI} = props
if (isMascara && isOnboarding) {
if ((isMascara || betaUI) && isOnboarding && !props.isPopup) {
return h(MascaraFirstTime)
}

2
ui/app/reducers/metamask.js
View File

@ -1,6 +1,7 @@
const extend = require('xtend')
const actions = require('../actions')
const MetamascaraPlatform = require('../../../app/scripts/platforms/window')
const environmentType = require('../../../app/scripts/lib/environment-type')
const { OLD_UI_NETWORK_TYPE } = require('../../../app/scripts/config').enums
module.exports = reduceMetamask
@ -14,6 +15,7 @@ function reduceMetamask (state, action) {
isUnlocked: false,
isAccountMenuOpen: false,
isMascara: window.platform instanceof MetamascaraPlatform,
isPopup: environmentType() === 'popup',
rpcTarget: 'https://rawtestrpc.metamask.io/',
identities: {},
unapprovedTxs: {},