diff --git a/apps/browser/src/popup/app-routing.module.ts b/apps/browser/src/popup/app-routing.module.ts
index 934bf0759a2..97008ab96d9 100644
--- a/apps/browser/src/popup/app-routing.module.ts
+++ b/apps/browser/src/popup/app-routing.module.ts
@@ -40,6 +40,7 @@ import { AboutPageV2Component } from "../tools/popup/settings/about-page/about-p
import { AboutPageComponent } from "../tools/popup/settings/about-page/about-page.component";
import { MoreFromBitwardenPageV2Component } from "../tools/popup/settings/about-page/more-from-bitwarden-page-v2.component";
import { MoreFromBitwardenPageComponent } from "../tools/popup/settings/about-page/more-from-bitwarden-page.component";
+import { ExportBrowserV2Component } from "../tools/popup/settings/export/export-browser-v2.component";
import { ExportBrowserComponent } from "../tools/popup/settings/export/export-browser.component";
import { ImportBrowserV2Component } from "../tools/popup/settings/import/import-browser-v2.component";
import { ImportBrowserComponent } from "../tools/popup/settings/import/import-browser.component";
@@ -243,12 +244,11 @@ const routes: Routes = [
canActivate: [AuthGuard],
data: { state: "import" },
}),
- {
+ ...extensionRefreshSwap(ExportBrowserComponent, ExportBrowserV2Component, {
path: "export",
- component: ExportBrowserComponent,
canActivate: [AuthGuard],
data: { state: "export" },
- },
+ }),
{
path: "autofill",
component: AutofillComponent,
diff --git a/apps/browser/src/tools/popup/settings/export/export-browser-v2.component.html b/apps/browser/src/tools/popup/settings/export/export-browser-v2.component.html
new file mode 100644
index 00000000000..9ad6ed36835
--- /dev/null
+++ b/apps/browser/src/tools/popup/settings/export/export-browser-v2.component.html
@@ -0,0 +1,27 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/apps/browser/src/tools/popup/settings/export/export-browser-v2.component.ts b/apps/browser/src/tools/popup/settings/export/export-browser-v2.component.ts
new file mode 100644
index 00000000000..cbb66cbcf5a
--- /dev/null
+++ b/apps/browser/src/tools/popup/settings/export/export-browser-v2.component.ts
@@ -0,0 +1,40 @@
+import { CommonModule } from "@angular/common";
+import { Component } from "@angular/core";
+import { Router, RouterLink } from "@angular/router";
+
+import { JslibModule } from "@bitwarden/angular/jslib.module";
+import { AsyncActionsModule, ButtonModule, DialogModule } from "@bitwarden/components";
+import { ExportComponent } from "@bitwarden/vault-export-ui";
+
+import { PopOutComponent } from "../../../../platform/popup/components/pop-out.component";
+import { PopupFooterComponent } from "../../../../platform/popup/layout/popup-footer.component";
+import { PopupHeaderComponent } from "../../../../platform/popup/layout/popup-header.component";
+import { PopupPageComponent } from "../../../../platform/popup/layout/popup-page.component";
+
+@Component({
+ templateUrl: "export-browser-v2.component.html",
+ standalone: true,
+ imports: [
+ CommonModule,
+ RouterLink,
+ JslibModule,
+ DialogModule,
+ AsyncActionsModule,
+ ButtonModule,
+ ExportComponent,
+ PopupPageComponent,
+ PopupFooterComponent,
+ PopupHeaderComponent,
+ PopOutComponent,
+ ],
+})
+export class ExportBrowserV2Component {
+ protected disabled = false;
+ protected loading = false;
+
+ constructor(private router: Router) {}
+
+ protected async onSuccessfulExport(organizationId: string): Promise {
+ await this.router.navigate(["/vault-settings"]);
+ }
+}