- {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;
}