From 3008b5392111bb35e968f93582f8d427f752a713 Mon Sep 17 00:00:00 2001
From: Alex Dragovich <adragovich@bitwarden.com>
Date: Thu, 13 Aug 2026 13:32:51 -0700
Subject: [PATCH 1/2] [PM-40396] tools export routing change from tools to
 settings

---
 .../app/layouts/user-layout.component.html    |  2 +-
 apps/web/src/app/oss-routing.module.ts        | 19 ++++++++++++-------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/apps/web/src/app/layouts/user-layout.component.html b/apps/web/src/app/layouts/user-layout.component.html
index a6b971aa0016..02bd4bdb99ea 100644
--- a/apps/web/src/app/layouts/user-layout.component.html
+++ b/apps/web/src/app/layouts/user-layout.component.html
@@ -28,7 +28,7 @@
         [spotlight]="true"
       ></bit-nav-item>
       <app-coachmark #importCoachmark stepId="importData" />
-      <bit-nav-item [text]="'exportNoun' | i18n" route="tools/export"></bit-nav-item>
+      <bit-nav-item [text]="'exportNoun' | i18n" route="settings/export"></bit-nav-item>
     </bit-nav-group>
     <bit-nav-item
       icon="bwi-sliders"
diff --git a/apps/web/src/app/oss-routing.module.ts b/apps/web/src/app/oss-routing.module.ts
index 16e1380f2803..3843668569f3 100644
--- a/apps/web/src/app/oss-routing.module.ts
+++ b/apps/web/src/app/oss-routing.module.ts
@@ -773,6 +773,16 @@ const routes: Routes = [
             component: SponsoredFamiliesComponent,
             data: { titleId: "sponsoredFamilies" } satisfies RouteDataProperties,
           },
+          {
+            path: "export",
+            loadComponent: () =>
+              import("./tools/vault-export/export-web.component").then(
+                (mod) => mod.ExportWebComponent,
+              ),
+            data: {
+              titleId: "exportNoun",
+            } satisfies RouteDataProperties,
+          },
         ],
       },
       {
@@ -790,13 +800,8 @@ const routes: Routes = [
           },
           {
             path: "export",
-            loadComponent: () =>
-              import("./tools/vault-export/export-web.component").then(
-                (mod) => mod.ExportWebComponent,
-              ),
-            data: {
-              titleId: "exportNoun",
-            } satisfies RouteDataProperties,
+            redirectTo: "/settings/export",
+            pathMatch: "full",
           },
           {
             path: "generator",

From dfac09939368560717ff98e404993cf34466a4c4 Mon Sep 17 00:00:00 2001
From: Alex Dragovich <adragovich@bitwarden.com>
Date: Thu, 13 Aug 2026 17:18:05 -0700
Subject: [PATCH 2/2] [PM-40396] adding vfo1 ff

---
 .../app/layouts/user-layout.component.html    |  2 +-
 .../src/app/layouts/user-layout.component.ts  | 12 ++++++++++
 apps/web/src/app/oss-routing.module.ts        | 24 +++++++++++++++----
 3 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/apps/web/src/app/layouts/user-layout.component.html b/apps/web/src/app/layouts/user-layout.component.html
index 02bd4bdb99ea..108a0e8373c4 100644
--- a/apps/web/src/app/layouts/user-layout.component.html
+++ b/apps/web/src/app/layouts/user-layout.component.html
@@ -28,7 +28,7 @@
         [spotlight]="true"
       ></bit-nav-item>
       <app-coachmark #importCoachmark stepId="importData" />
-      <bit-nav-item [text]="'exportNoun' | i18n" route="settings/export"></bit-nav-item>
+      <bit-nav-item [text]="'exportNoun' | i18n" [route]="exportRoute()"></bit-nav-item>
     </bit-nav-group>
     <bit-nav-item
       icon="bwi-sliders"
diff --git a/apps/web/src/app/layouts/user-layout.component.ts b/apps/web/src/app/layouts/user-layout.component.ts
index 2dbe30497fa0..6abe367e6e93 100644
--- a/apps/web/src/app/layouts/user-layout.component.ts
+++ b/apps/web/src/app/layouts/user-layout.component.ts
@@ -12,6 +12,8 @@ import { canAccessEmergencyAccess } from "@bitwarden/common/admin-console/abstra
 import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { getUserId } from "@bitwarden/common/auth/services/account.service";
+import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { SyncService } from "@bitwarden/common/platform/sync";
 import { PopoverModule, SideNavService, SvgModule } from "@bitwarden/components";
 import { SendPolicyService } from "@bitwarden/send-ui";
@@ -48,6 +50,16 @@ export class UserLayoutComponent implements OnInit {
 
   protected readonly coachmarkService = inject(CoachmarkService);
   protected readonly sideNavService = inject(SideNavService);
+  private readonly configService = inject(ConfigService);
+
+  protected readonly exportRoute = computed(() => {
+    const vfo1Enabled = this.vfo1Enabled();
+    return vfo1Enabled ? "/settings/export" : "/tools/export";
+  });
+
+  protected readonly vfo1Enabled = toSignal(
+    this.configService.getFeatureFlag$(FeatureFlag.VFO1Foundation),
+  );
 
   protected readonly importCoachmarkOpen = computed(
     () => this.coachmarkService.activeStepId() === "importData",
diff --git a/apps/web/src/app/oss-routing.module.ts b/apps/web/src/app/oss-routing.module.ts
index 3843668569f3..25271fcf13ce 100644
--- a/apps/web/src/app/oss-routing.module.ts
+++ b/apps/web/src/app/oss-routing.module.ts
@@ -1,5 +1,5 @@
-import { NgModule } from "@angular/core";
-import { Route, RouterModule, Routes } from "@angular/router";
+import { NgModule, inject } from "@angular/core";
+import { Route, Router, RouterModule, Routes } from "@angular/router";
 import { map, switchMap } from "rxjs";
 
 import { organizationPolicyGuard } from "@bitwarden/angular/admin-console/guards";
@@ -53,6 +53,7 @@ import {
 import { canAccessEmergencyAccess } from "@bitwarden/common/admin-console/abstractions/organization/organization.service.abstraction";
 import { PolicyType } from "@bitwarden/common/admin-console/enums";
 import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { AnonLayoutWrapperComponent, AnonLayoutWrapperData } from "@bitwarden/components";
 import { LockComponent, RemovePasswordComponent } from "@bitwarden/key-management-ui";
 import { premiumInterestRedirectGuard } from "@bitwarden/web-vault/app/vault/guards/premium-interest-redirect/premium-interest-redirect.guard";
@@ -779,6 +780,7 @@ const routes: Routes = [
               import("./tools/vault-export/export-web.component").then(
                 (mod) => mod.ExportWebComponent,
               ),
+            canActivate: [canAccessFeature(FeatureFlag.VFO1Foundation)],
             data: {
               titleId: "exportNoun",
             } satisfies RouteDataProperties,
@@ -800,8 +802,14 @@ const routes: Routes = [
           },
           {
             path: "export",
-            redirectTo: "/settings/export",
-            pathMatch: "full",
+            loadComponent: () =>
+              import("./tools/vault-export/export-web.component").then(
+                (mod) => mod.ExportWebComponent,
+              ),
+            canActivate: [vfo1ConditionalRedirect],
+            data: {
+              titleId: "exportNoun",
+            } satisfies RouteDataProperties,
           },
           {
             path: "generator",
@@ -824,6 +832,14 @@ const routes: Routes = [
   },
 ];
 
+function vfo1ConditionalRedirect() {
+  const configService = inject(ConfigService);
+  const router = inject(Router);
+  return configService
+    .getFeatureFlag$(FeatureFlag.VFO1Foundation)
+    .pipe(map((isEnabled) => (isEnabled ? router.parseUrl("/settings/export") : true)));
+}
+
 @NgModule({
   imports: [
     RouterModule.forRoot(routes, {