diff --git a/.metamaskrc.dist b/.metamaskrc.dist index 7077de494..8dc5610f5 100644 --- a/.metamaskrc.dist +++ b/.metamaskrc.dist @@ -2,7 +2,6 @@ PASSWORD=METAMASK PASSWORD INFURA_PROJECT_ID=00000000000 SEGMENT_WRITE_KEY= -ONBOARDING_V2= SWAPS_USE_DEV_APIS= NFTS_V1= PUBNUB_PUB_KEY= diff --git a/development/build/config.js b/development/build/config.js index 328412f59..fc881bf38 100644 --- a/development/build/config.js +++ b/development/build/config.js @@ -9,7 +9,6 @@ const configurationPropertyNames = [ ...commonConfigurationPropertyNames, 'NFTS_V1', 'INFURA_PROJECT_ID', - 'ONBOARDING_V2', 'PHISHING_WARNING_PAGE_URL', 'PORTFOLIO_URL', 'SEGMENT_HOST', diff --git a/development/build/scripts.js b/development/build/scripts.js index 083e9bbcf..b98b73fc4 100644 --- a/development/build/scripts.js +++ b/development/build/scripts.js @@ -1032,7 +1032,6 @@ async function getEnvironmentVariables({ buildTarget, buildType, version }) { METAMASK_VERSION: version, METAMASK_BUILD_TYPE: buildType, NODE_ENV: devMode ? ENVIRONMENT.DEVELOPMENT : ENVIRONMENT.PRODUCTION, - ONBOARDING_V2: config.ONBOARDING_V2 === '1', PHISHING_WARNING_PAGE_URL: getPhishingWarningPageUrl({ config, testing }), PORTFOLIO_URL: config.PORTFOLIO_URL || 'https://portfolio.metamask.io', PUBNUB_PUB_KEY: config.PUBNUB_PUB_KEY || '', diff --git a/test/e2e/helpers.js b/test/e2e/helpers.js index 6d1219839..2d9706ea9 100644 --- a/test/e2e/helpers.js +++ b/test/e2e/helpers.js @@ -3,7 +3,6 @@ const { promises: fs } = require('fs'); const BigNumber = require('bignumber.js'); const mockttp = require('mockttp'); const createStaticServer = require('../../development/create-static-server'); -const enLocaleMessages = require('../../app/_locales/en/messages.json'); const { setupMocking } = require('./mock-e2e'); const Ganache = require('./ganache'); const FixtureServer = require('./fixture-server'); @@ -246,65 +245,31 @@ const completeImportSRPOnboardingFlow = async ( seedPhrase, password, ) => { - if (process.env.ONBOARDING_V2 === '1') { - // welcome - await driver.clickElement('[data-testid="onboarding-import-wallet"]'); + // welcome + await driver.clickElement('[data-testid="onboarding-import-wallet"]'); - // metrics - await driver.clickElement('[data-testid="metametrics-no-thanks"]'); + // metrics + await driver.clickElement('[data-testid="metametrics-no-thanks"]'); - // import with recovery phrase - await driver.fill('[data-testid="import-srp-text"]', seedPhrase); - await driver.clickElement('[data-testid="import-srp-confirm"]'); + // import with recovery phrase + await driver.pasteIntoField( + '[data-testid="import-srp__srp-word-0"]', + seedPhrase, + ); + await driver.clickElement('[data-testid="import-srp-confirm"]'); - // create password - await driver.fill('[data-testid="create-password-new"]', password); - await driver.fill('[data-testid="create-password-confirm"]', password); - await driver.clickElement('[data-testid="create-password-terms"]'); - await driver.clickElement('[data-testid="create-password-import"]'); + // create password + await driver.fill('[data-testid="create-password-new"]', password); + await driver.fill('[data-testid="create-password-confirm"]', password); + await driver.clickElement('[data-testid="create-password-terms"]'); + await driver.clickElement('[data-testid="create-password-import"]'); - // complete - await driver.clickElement('[data-testid="onboarding-complete-done"]'); + // complete + await driver.clickElement('[data-testid="onboarding-complete-done"]'); - // pin extension - await driver.clickElement('[data-testid="pin-extension-next"]'); - await driver.clickElement('[data-testid="pin-extension-done"]'); - } else { - // clicks the continue button on the welcome screen - await driver.findElement('.welcome-page__header'); - await driver.clickElement({ - text: enLocaleMessages.getStarted.message, - tag: 'button', - }); - - // clicks the "No thanks" option on the metametrics opt-in screen - await driver.clickElement('.btn-secondary'); - - // clicks the "Import Wallet" option - await driver.clickElement({ text: 'Import wallet', tag: 'button' }); - - // Import Secret Recovery Phrase - await driver.pasteIntoField( - '[data-testid="import-srp__srp-word-0"]', - seedPhrase, - ); - - await driver.fill('#password', password); - await driver.fill('#confirm-password', password); - - await driver.clickElement( - '[data-testid="create-new-vault__terms-checkbox"]', - ); - - await driver.clickElement({ text: 'Import', tag: 'button' }); - - // clicks through the success screen - await driver.findElement({ text: 'Congratulations', tag: 'div' }); - await driver.clickElement({ - text: enLocaleMessages.endOfFlowMessage10.message, - tag: 'button', - }); - } + // pin extension + await driver.clickElement('[data-testid="pin-extension-next"]'); + await driver.clickElement('[data-testid="pin-extension-done"]'); }; const completeImportSRPOnboardingFlowWordByWord = async ( @@ -312,19 +277,13 @@ const completeImportSRPOnboardingFlowWordByWord = async ( seedPhrase, password, ) => { - // clicks the continue button on the welcome screen - await driver.findElement('.welcome-page__header'); - await driver.clickElement({ - text: enLocaleMessages.getStarted.message, - tag: 'button', - }); + // welcome + await driver.clickElement('[data-testid="onboarding-import-wallet"]'); - // clicks the "No thanks" option on the metametrics opt-in screen - await driver.clickElement('.btn-secondary'); - - // clicks the "Import Wallet" option - await driver.clickElement({ text: 'Import wallet', tag: 'button' }); + // metrics + await driver.clickElement('[data-testid="metametrics-no-thanks"]'); + // import with recovery phrase, word by word const words = seedPhrase.split(' '); for (const word of words) { await driver.pasteIntoField( @@ -332,20 +291,20 @@ const completeImportSRPOnboardingFlowWordByWord = async ( word, ); } + await driver.clickElement('[data-testid="import-srp-confirm"]'); - await driver.fill('#password', password); - await driver.fill('#confirm-password', password); + // create password + await driver.fill('[data-testid="create-password-new"]', password); + await driver.fill('[data-testid="create-password-confirm"]', password); + await driver.clickElement('[data-testid="create-password-terms"]'); + await driver.clickElement('[data-testid="create-password-import"]'); - await driver.clickElement('[data-testid="create-new-vault__terms-checkbox"]'); + // complete + await driver.clickElement('[data-testid="onboarding-complete-done"]'); - await driver.clickElement({ text: 'Import', tag: 'button' }); - - // clicks through the success screen - await driver.findElement({ text: 'Congratulations', tag: 'div' }); - await driver.clickElement({ - text: enLocaleMessages.endOfFlowMessage10.message, - tag: 'button', - }); + // pin extension + await driver.clickElement('[data-testid="pin-extension-next"]'); + await driver.clickElement('[data-testid="pin-extension-done"]'); }; module.exports = { diff --git a/test/e2e/metamask-ui.spec.js b/test/e2e/metamask-ui.spec.js index 347609a9f..14e685c25 100644 --- a/test/e2e/metamask-ui.spec.js +++ b/test/e2e/metamask-ui.spec.js @@ -90,94 +90,53 @@ describe('MetaMask', function () { }); describe('Going through the first time flow', function () { - it('clicks the continue button on the welcome screen', async function () { - await driver.findElement('.welcome-page__header'); - await driver.clickElement({ - text: enLocaleMessages.getStarted.message, - tag: 'button', - }); - await driver.delay(largeDelayMs); + it('clicks the "Create New Wallet" button on the welcome screen', async function () { + await driver.clickElement('[data-testid="onboarding-create-wallet"]'); }); it('clicks the "No thanks" option on the metametrics opt-in screen', async function () { - await driver.clickElement('.btn-secondary'); - await driver.delay(largeDelayMs); - }); - - it('clicks the "Create New Wallet" option', async function () { - await driver.clickElement({ text: 'Create a wallet', tag: 'button' }); - await driver.delay(largeDelayMs); + await driver.clickElement('[data-testid="metametrics-no-thanks"]'); }); it('accepts a secure password', async function () { - await driver.fill( - '.first-time-flow__form #create-password', - 'correct horse battery staple', - ); - await driver.fill( - '.first-time-flow__form #confirm-password', - 'correct horse battery staple', - ); - - await driver.clickElement('.first-time-flow__checkbox'); - - await driver.clickElement('.first-time-flow__form button'); - await driver.delay(regularDelayMs); + const password = 'correct horse battery staple'; + await driver.fill('[data-testid="create-password-new"]', password); + await driver.fill('[data-testid="create-password-confirm"]', password); + await driver.clickElement('[data-testid="create-password-terms"]'); + await driver.clickElement('[data-testid="create-password-wallet"]'); }); - let seedPhrase; - it('renders the Secret Recovery Phrase intro screen', async function () { - await driver.clickElement('.seed-phrase-intro__left button'); - await driver.delay(regularDelayMs); + await driver.clickElement('[data-testid="secure-wallet-recommended"]'); }); + let chipTwo, chipThree, chipSeven; + it('reveals the Secret Recovery Phrase', async function () { - const byRevealButton = - '.reveal-seed-phrase__secret-blocker .reveal-seed-phrase__reveal-button'; - await driver.findElement(byRevealButton); - await driver.clickElement(byRevealButton); - await driver.delay(regularDelayMs); - - const revealedSeedPhrase = await driver.findElement( - '.reveal-seed-phrase__secret-words', - ); - seedPhrase = await revealedSeedPhrase.getText(); - assert.equal(seedPhrase.split(' ').length, 12); - await driver.delay(regularDelayMs); - - await driver.clickElement({ - text: enLocaleMessages.next.message, - tag: 'button', - }); - await driver.delay(regularDelayMs); + await driver.clickElement('[data-testid="recovery-phrase-reveal"]'); + chipTwo = await ( + await driver.findElement('[data-testid="recovery-phrase-chip-2"]') + ).getText(); + chipThree = await ( + await driver.findElement('[data-testid="recovery-phrase-chip-3"]') + ).getText(); + chipSeven = await ( + await driver.findElement('[data-testid="recovery-phrase-chip-7"]') + ).getText(); + await driver.clickElement('[data-testid="recovery-phrase-next"]'); }); - async function clickWordAndWait(word) { - await driver.clickElement( - `[data-testid="seed-phrase-sorted"] [data-testid="draggable-seed-${word}"]`, - ); - await driver.delay(tinyDelayMs); - } - it('can retype the Secret Recovery Phrase', async function () { - const words = seedPhrase.split(' '); - - for (const word of words) { - await clickWordAndWait(word); - } - - await driver.clickElement({ text: 'Confirm', tag: 'button' }); - await driver.delay(regularDelayMs); + await driver.fill('[data-testid="recovery-phrase-input-2"]', chipTwo); + await driver.fill('[data-testid="recovery-phrase-input-3"]', chipThree); + await driver.fill('[data-testid="recovery-phrase-input-7"]', chipSeven); + await driver.clickElement('[data-testid="recovery-phrase-confirm"]'); }); it('clicks through the success screen', async function () { - await driver.findElement({ text: 'Congratulations', tag: 'div' }); - await driver.clickElement({ - text: enLocaleMessages.endOfFlowMessage10.message, - tag: 'button', - }); - await driver.delay(regularDelayMs); + await driver.clickElement('[data-testid="onboarding-complete-done"]'); + await driver.clickElement('[data-testid="pin-extension-next"]'); + await driver.clickElement('[data-testid="pin-extension-done"]'); }); }); diff --git a/test/e2e/tests/incremental-security.spec.js b/test/e2e/tests/incremental-security.spec.js index f54f9563a..2daf70a91 100644 --- a/test/e2e/tests/incremental-security.spec.js +++ b/test/e2e/tests/incremental-security.spec.js @@ -1,6 +1,5 @@ const { strict: assert } = require('assert'); -const { convertToHexValue, withFixtures, tinyDelayMs } = require('../helpers'); -const enLocaleMessages = require('../../../app/_locales/en/messages.json'); +const { convertToHexValue, withFixtures } = require('../helpers'); const FixtureBuilder = require('../fixture-builder'); describe('Incremental Security', function () { @@ -30,42 +29,40 @@ describe('Incremental Security', function () { }, async ({ driver }) => { await driver.navigate(); - await driver.delay(tinyDelayMs); - // clicks the continue button on the welcome screen - await driver.findElement('.welcome-page__header'); - await driver.clickElement({ - text: enLocaleMessages.getStarted.message, - tag: 'button', - }); + // welcome + await driver.clickElement('[data-testid="onboarding-create-wallet"]'); - // clicks the "No thanks" option on the metametrics opt-in screen - await driver.clickElement('.btn-secondary'); + // metrics + await driver.clickElement('[data-testid="metametrics-no-thanks"]'); - // clicks the "Create New Wallet" option - await driver.clickElement({ text: 'Create a wallet', tag: 'button' }); - - // accepts a secure password + // create password await driver.fill( - '.first-time-flow__form #create-password', + '[data-testid="create-password-new"]', 'correct horse battery staple', ); await driver.fill( - '.first-time-flow__form #confirm-password', + '[data-testid="create-password-confirm"]', 'correct horse battery staple', ); - await driver.clickElement('.first-time-flow__checkbox'); - await driver.clickElement('.first-time-flow__form button'); + await driver.clickElement('[data-testid="create-password-terms"]'); + await driver.clickElement('[data-testid="create-password-wallet"]'); - // renders the Secret Recovery Phrase intro screen' - await driver.clickElement('.seed-phrase-intro__left button'); + // secure wallet later + await driver.clickElement('[data-testid="secure-wallet-later"]'); + await driver.clickElement( + '[data-testid="skip-srp-backup-popover-checkbox"]', + ); + await driver.clickElement('[data-testid="skip-srp-backup"]'); - // skips the Secret Recovery Phrase challenge - await driver.clickElement({ - text: enLocaleMessages.remindMeLater.message, - tag: 'button', - }); + // complete + await driver.clickElement('[data-testid="onboarding-complete-done"]'); + // pin extension + await driver.clickElement('[data-testid="pin-extension-next"]'); + await driver.clickElement('[data-testid="pin-extension-done"]'); + + // open account menu await driver.clickElement( '[data-testid="account-options-menu-button"]', ); @@ -124,41 +121,24 @@ describe('Incremental Security', function () { await driver.clickElement('.home-notification__accept-button'); // reveals the Secret Recovery Phrase - await driver.clickElement( - '.reveal-seed-phrase__secret-blocker .reveal-seed-phrase__reveal-button', - ); - - const revealedSeedPhrase = await driver.findElement( - '.reveal-seed-phrase__secret-words', - ); - await driver.waitForNonEmptyElement(revealedSeedPhrase); - const seedPhrase = await revealedSeedPhrase.getText(); - assert.equal(seedPhrase.split(' ').length, 12); - - await driver.clickElement({ - text: enLocaleMessages.next.message, - tag: 'button', - }); - - // selecting the words from seedphrase - async function clickWordAndWait(word) { - await driver.clickElement( - `[data-testid="seed-phrase-sorted"] [data-testid="draggable-seed-${word}"]`, - ); - await driver.delay(tinyDelayMs); - } + await driver.clickElement('[data-testid="secure-wallet-recommended"]'); + await driver.clickElement('[data-testid="recovery-phrase-reveal"]'); + const chipTwo = await ( + await driver.findElement('[data-testid="recovery-phrase-chip-2"]') + ).getText(); + const chipThree = await ( + await driver.findElement('[data-testid="recovery-phrase-chip-3"]') + ).getText(); + const chipSeven = await ( + await driver.findElement('[data-testid="recovery-phrase-chip-7"]') + ).getText(); + await driver.clickElement('[data-testid="recovery-phrase-next"]'); // can retype the Secret Recovery Phrase - const words = seedPhrase.split(' '); - - for (const word of words) { - await clickWordAndWait(word); - } - - await driver.clickElement({ text: 'Confirm', tag: 'button' }); - - // can click through the success screen - await driver.clickElement({ text: 'All done', tag: 'button' }); + await driver.fill('[data-testid="recovery-phrase-input-2"]', chipTwo); + await driver.fill('[data-testid="recovery-phrase-input-3"]', chipThree); + await driver.fill('[data-testid="recovery-phrase-input-7"]', chipSeven); + await driver.clickElement('[data-testid="recovery-phrase-confirm"]'); // should have the correct amount of eth currencyDisplay = await driver.waitForSelector({ diff --git a/test/e2e/tests/metamask-responsive-ui.spec.js b/test/e2e/tests/metamask-responsive-ui.spec.js index 0fba51b13..8dc91e0b4 100644 --- a/test/e2e/tests/metamask-responsive-ui.spec.js +++ b/test/e2e/tests/metamask-responsive-ui.spec.js @@ -1,6 +1,5 @@ const { strict: assert } = require('assert'); -const { convertToHexValue, withFixtures, tinyDelayMs } = require('../helpers'); -const enLocaleMessages = require('../../../app/_locales/en/messages.json'); +const { convertToHexValue, withFixtures } = require('../helpers'); const FixtureBuilder = require('../fixture-builder'); describe('MetaMask Responsive UI', function () { @@ -17,127 +16,52 @@ describe('MetaMask Responsive UI', function () { async ({ driver }) => { await driver.navigate(); - async function clickWordAndWait(word) { - await driver.clickElement( - `[data-testid="seed-phrase-sorted"] [data-testid="draggable-seed-${word}"]`, - ); - await driver.delay(tinyDelayMs); - } + // welcome + await driver.clickElement('[data-testid="onboarding-create-wallet"]'); - if (process.env.ONBOARDING_V2 === '1') { - // welcome - await driver.clickElement('[data-testid="onboarding-create-wallet"]'); + // metrics + await driver.clickElement('[data-testid="metametrics-no-thanks"]'); - // metrics - await driver.clickElement('[data-testid="metametrics-no-thanks"]'); + // create password + await driver.fill( + '[data-testid="create-password-new"]', + 'correct horse battery staple', + ); + await driver.fill( + '[data-testid="create-password-confirm"]', + 'correct horse battery staple', + ); + await driver.clickElement('[data-testid="create-password-terms"]'); + await driver.clickElement('[data-testid="create-password-wallet"]'); - // create password - await driver.fill( - '[data-testid="create-password-new"]', - 'correct horse battery staple', - ); - await driver.fill( - '[data-testid="create-password-confirm"]', - 'correct horse battery staple', - ); - await driver.clickElement('[data-testid="create-password-terms"]'); - await driver.clickElement('[data-testid="create-password-wallet"]'); + // secure wallet + await driver.clickElement('[data-testid="secure-wallet-recommended"]'); - // secure wallet - await driver.clickElement( - '[data-testid="secure-wallet-recommended"]', - ); + // review + await driver.clickElement('[data-testid="recovery-phrase-reveal"]'); + const chipTwo = await ( + await driver.findElement('[data-testid="recovery-phrase-chip-2"]') + ).getText(); + const chipThree = await ( + await driver.findElement('[data-testid="recovery-phrase-chip-3"]') + ).getText(); + const chipSeven = await ( + await driver.findElement('[data-testid="recovery-phrase-chip-7"]') + ).getText(); + await driver.clickElement('[data-testid="recovery-phrase-next"]'); - // review - await driver.clickElement('[data-testid="recovery-phrase-reveal"]'); - const chipTwo = await ( - await driver.findElement('[data-testid="recovery-phrase-chip-2"]') - ).getText(); - const chipThree = await ( - await driver.findElement('[data-testid="recovery-phrase-chip-3"]') - ).getText(); - const chipSeven = await ( - await driver.findElement('[data-testid="recovery-phrase-chip-7"]') - ).getText(); - await driver.clickElement('[data-testid="recovery-phrase-next"]'); + // confirm + await driver.fill('[data-testid="recovery-phrase-input-2"]', chipTwo); + await driver.fill('[data-testid="recovery-phrase-input-3"]', chipThree); + await driver.fill('[data-testid="recovery-phrase-input-7"]', chipSeven); + await driver.clickElement('[data-testid="recovery-phrase-confirm"]'); - // confirm - await driver.fill('[data-testid="recovery-phrase-input-2"]', chipTwo); - await driver.fill( - '[data-testid="recovery-phrase-input-3"]', - chipThree, - ); - await driver.fill( - '[data-testid="recovery-phrase-input-7"]', - chipSeven, - ); - await driver.clickElement('[data-testid="recovery-phrase-confirm"]'); + // complete + await driver.clickElement('[data-testid="onboarding-complete-done"]'); - // complete - await driver.clickElement('[data-testid="onboarding-complete-done"]'); - - // pin extension - await driver.clickElement('[data-testid="pin-extension-next"]'); - await driver.clickElement('[data-testid="pin-extension-done"]'); - } else { - // clicks the continue button on the welcome screen - await driver.findElement('.welcome-page__header'); - await driver.clickElement({ - text: enLocaleMessages.getStarted.message, - tag: 'button', - }); - await driver.delay(tinyDelayMs); - - // clicks the "I agree" option on the metametrics opt-in screen - await driver.clickElement('.btn-primary'); - - // clicks the "Create New Wallet" option - await driver.clickElement({ text: 'Create a wallet', tag: 'button' }); - - // accepts a secure password - await driver.fill( - '.first-time-flow__form #create-password', - 'correct horse battery staple', - ); - await driver.fill( - '.first-time-flow__form #confirm-password', - 'correct horse battery staple', - ); - await driver.clickElement('.first-time-flow__checkbox'); - await driver.clickElement('.first-time-flow__form button'); - - // renders the Secret Recovery Phrase intro screen - await driver.clickElement('.seed-phrase-intro__left button'); - - // reveals the Secret Recovery Phrase - await driver.clickElement( - '.reveal-seed-phrase__secret-blocker .reveal-seed-phrase__reveal-button', - ); - const revealedSeedPhrase = await driver.findElement( - '.reveal-seed-phrase__secret-words', - ); - const seedPhrase = await revealedSeedPhrase.getText(); - assert.equal(seedPhrase.split(' ').length, 12); - - await driver.clickElement({ - text: enLocaleMessages.next.message, - tag: 'button', - }); - - // can retype the Secret Recovery Phrase - const words = seedPhrase.split(' '); - for (const word of words) { - await clickWordAndWait(word); - } - await driver.clickElement({ text: 'Confirm', tag: 'button' }); - - // clicks through the success screen - await driver.findElement({ text: 'Congratulations', tag: 'div' }); - await driver.clickElement({ - text: enLocaleMessages.endOfFlowMessage10.message, - tag: 'button', - }); - } + // pin extension + await driver.clickElement('[data-testid="pin-extension-next"]'); + await driver.clickElement('[data-testid="pin-extension-done"]'); // assert balance const balance = await driver.findElement( diff --git a/ui/helpers/higher-order-components/authenticated/authenticated.component.js b/ui/helpers/higher-order-components/authenticated/authenticated.component.js index bd4604750..e39648a68 100644 --- a/ui/helpers/higher-order-components/authenticated/authenticated.component.js +++ b/ui/helpers/higher-order-components/authenticated/authenticated.component.js @@ -1,11 +1,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import { Redirect, Route } from 'react-router-dom'; -import { - UNLOCK_ROUTE, - INITIALIZE_ROUTE, - ONBOARDING_ROUTE, -} from '../../constants/routes'; +import { UNLOCK_ROUTE, ONBOARDING_ROUTE } from '../../constants/routes'; export default function Authenticated(props) { const { isUnlocked, completedOnboarding } = props; @@ -16,9 +12,7 @@ export default function Authenticated(props) { return ( ); diff --git a/ui/helpers/higher-order-components/initialized/initialized.component.js b/ui/helpers/higher-order-components/initialized/initialized.component.js index 5773d605a..55ad766ff 100644 --- a/ui/helpers/higher-order-components/initialized/initialized.component.js +++ b/ui/helpers/higher-order-components/initialized/initialized.component.js @@ -1,7 +1,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import { Redirect, Route } from 'react-router-dom'; -import { INITIALIZE_ROUTE, ONBOARDING_ROUTE } from '../../constants/routes'; +import { ONBOARDING_ROUTE } from '../../constants/routes'; export default function Initialized(props) { return props.completedOnboarding ? ( @@ -9,9 +9,7 @@ export default function Initialized(props) { ) : ( ); diff --git a/ui/pages/home/home.component.js b/ui/pages/home/home.component.js index 12a91fa7e..220d5865b 100644 --- a/ui/pages/home/home.component.js +++ b/ui/pages/home/home.component.js @@ -36,7 +36,6 @@ import { RESTORE_VAULT_ROUTE, CONFIRM_TRANSACTION_ROUTE, CONFIRM_ADD_SUGGESTED_TOKEN_ROUTE, - INITIALIZE_BACKUP_SEED_PHRASE_ROUTE, CONNECT_ROUTE, CONNECTED_ROUTE, CONNECTED_ACCOUNTS_ROUTE, @@ -415,9 +414,7 @@ export default class Home extends PureComponent { descriptionText={t('backupApprovalNotice')} acceptText={t('backupNow')} onAccept={() => { - const backUpSRPRoute = process.env.ONBOARDING_V2 - ? `${ONBOARDING_SECURE_YOUR_WALLET_ROUTE}/?isFromReminder=true` - : INITIALIZE_BACKUP_SEED_PHRASE_ROUTE; + const backUpSRPRoute = `${ONBOARDING_SECURE_YOUR_WALLET_ROUTE}/?isFromReminder=true`; if (isPopup) { global.platform.openExtensionInBrowser(backUpSRPRoute); } else { diff --git a/ui/pages/routes/routes.component.js b/ui/pages/routes/routes.component.js index 24176bd23..325bb4330 100644 --- a/ui/pages/routes/routes.component.js +++ b/ui/pages/routes/routes.component.js @@ -174,9 +174,7 @@ export default class Routes extends Component { const routes = ( - {process.env.ONBOARDING_V2 && ( - - )} + @@ -307,7 +305,7 @@ export default class Routes extends Component { const isInitializing = Boolean( matchPath(location.pathname, { - path: process.env.ONBOARDING_V2 ? ONBOARDING_ROUTE : INITIALIZE_ROUTE, + path: ONBOARDING_ROUTE, exact: false, }), ); @@ -436,9 +434,7 @@ export default class Routes extends Component { } /> )} - {process.env.ONBOARDING_V2 && this.showOnboardingHeader() && ( - - )} + {this.showOnboardingHeader() && } {completedOnboarding ? : null}
diff --git a/ui/selectors/first-time-flow.js b/ui/selectors/first-time-flow.js index 623e1d01b..f8a9e6004 100644 --- a/ui/selectors/first-time-flow.js +++ b/ui/selectors/first-time-flow.js @@ -1,6 +1,4 @@ import { - INITIALIZE_CREATE_PASSWORD_ROUTE, - INITIALIZE_IMPORT_WITH_SEED_PHRASE_ROUTE, DEFAULT_ROUTE, ONBOARDING_CREATE_PASSWORD_ROUTE, ONBOARDING_IMPORT_WITH_SRP_ROUTE, @@ -11,13 +9,9 @@ export function getFirstTimeFlowTypeRoute(state) { let nextRoute; if (firstTimeFlowType === 'create') { - nextRoute = process.env.ONBOARDING_V2 - ? ONBOARDING_CREATE_PASSWORD_ROUTE - : INITIALIZE_CREATE_PASSWORD_ROUTE; + nextRoute = ONBOARDING_CREATE_PASSWORD_ROUTE; } else if (firstTimeFlowType === 'import') { - nextRoute = process.env.ONBOARDING_V2 - ? ONBOARDING_IMPORT_WITH_SRP_ROUTE - : INITIALIZE_IMPORT_WITH_SEED_PHRASE_ROUTE; + nextRoute = ONBOARDING_IMPORT_WITH_SRP_ROUTE; } else { nextRoute = DEFAULT_ROUTE; }