From 59a1b335c86f6e8ebf1c1556280d549f1739ad58 Mon Sep 17 00:00:00 2001
From: Nick Krantz <nick@livefront.com>
Date: Fri, 28 Mar 2025 11:23:09 -0500
Subject: [PATCH] ensure the at-risk-passwords page navigates back to the vault

---
 .../at-risk-passwords/at-risk-passwords.component.html   | 7 ++++++-
 .../at-risk-passwords/at-risk-passwords.component.ts     | 9 +++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/apps/browser/src/vault/popup/components/at-risk-passwords/at-risk-passwords.component.html b/apps/browser/src/vault/popup/components/at-risk-passwords/at-risk-passwords.component.html
index cd93401c861..87629ce5700 100644
--- a/apps/browser/src/vault/popup/components/at-risk-passwords/at-risk-passwords.component.html
+++ b/apps/browser/src/vault/popup/components/at-risk-passwords/at-risk-passwords.component.html
@@ -1,5 +1,10 @@
 <popup-page [loading]="loading$ | async">
-  <popup-header slot="header" [pageTitle]="'atRiskPasswords' | i18n" showBackButton>
+  <popup-header
+    slot="header"
+    [pageTitle]="'atRiskPasswords' | i18n"
+    showBackButton
+    [backAction]="navigateToVault.bind(this)"
+  >
     <ng-container slot="end">
       <app-pop-out></app-pop-out>
     </ng-container>
diff --git a/apps/browser/src/vault/popup/components/at-risk-passwords/at-risk-passwords.component.ts b/apps/browser/src/vault/popup/components/at-risk-passwords/at-risk-passwords.component.ts
index dd3d53fed7d..66a14769a64 100644
--- a/apps/browser/src/vault/popup/components/at-risk-passwords/at-risk-passwords.component.ts
+++ b/apps/browser/src/vault/popup/components/at-risk-passwords/at-risk-passwords.component.ts
@@ -223,4 +223,13 @@ export class AtRiskPasswordsComponent implements OnInit {
       this.launchingCipher.set(null);
     }
   };
+
+  /**
+   * This page can be the first page the user sees when the extension launches,
+   * which can conflict with the `PopupRouterCacheService`. This replaces the
+   * built-in back button behavior so the user always navigates to the vault.
+   */
+  protected async navigateToVault() {
+    await this.router.navigate(["/tabs/vault"]);
+  }
 }