From eae894123dfe275371b565591a9c6f1e53715b5d Mon Sep 17 00:00:00 2001
From: Jordan Aasen <166539328+jaasen-livefront@users.noreply.github.com>
Date: Tue, 25 Nov 2025 10:33:21 -0800
Subject: [PATCH] [PM-28376] - update copy for autofill confirmation dialog url
list expand button (#17594)
* update copy for autofill confirmation dialog url list expand button
* fix tests
---
apps/browser/src/_locales/en/messages.json | 3 ++
...utofill-confirmation-dialog.component.html | 2 +-
...fill-confirmation-dialog.component.spec.ts | 53 +++++++++++++++----
3 files changed, 46 insertions(+), 12 deletions(-)
diff --git a/apps/browser/src/_locales/en/messages.json b/apps/browser/src/_locales/en/messages.json
index 6009bcba1bd..fe979e129f4 100644
--- a/apps/browser/src/_locales/en/messages.json
+++ b/apps/browser/src/_locales/en/messages.json
@@ -597,6 +597,9 @@
"viewAll": {
"message": "View all"
},
+ "showAll": {
+ "message": "Show all"
+ },
"viewLess": {
"message": "View less"
},
diff --git a/apps/browser/src/vault/popup/components/vault-v2/autofill-confirmation-dialog/autofill-confirmation-dialog.component.html b/apps/browser/src/vault/popup/components/vault-v2/autofill-confirmation-dialog/autofill-confirmation-dialog.component.html
index 6f61c5fa446..88bff47191a 100644
--- a/apps/browser/src/vault/popup/components/vault-v2/autofill-confirmation-dialog/autofill-confirmation-dialog.component.html
+++ b/apps/browser/src/vault/popup/components/vault-v2/autofill-confirmation-dialog/autofill-confirmation-dialog.component.html
@@ -24,7 +24,7 @@
class="tw-text-sm tw-font-medium tw-cursor-pointer"
(click)="toggleSavedUrlExpandedState()"
>
- {{ (savedUrlsExpanded() ? "viewLess" : "viewAll") | i18n }}
+ {{ (savedUrlsExpanded() ? "showLess" : "showAll") | i18n }}
diff --git a/apps/browser/src/vault/popup/components/vault-v2/autofill-confirmation-dialog/autofill-confirmation-dialog.component.spec.ts b/apps/browser/src/vault/popup/components/vault-v2/autofill-confirmation-dialog/autofill-confirmation-dialog.component.spec.ts
index e40019d99b6..a28b8730109 100644
--- a/apps/browser/src/vault/popup/components/vault-v2/autofill-confirmation-dialog/autofill-confirmation-dialog.component.spec.ts
+++ b/apps/browser/src/vault/popup/components/vault-v2/autofill-confirmation-dialog/autofill-confirmation-dialog.component.spec.ts
@@ -91,6 +91,11 @@ describe("AutofillConfirmationDialogComponent", () => {
jest.resetAllMocks();
});
+ const findShowAll = (inFx?: ComponentFixture
) =>
+ (inFx || fixture).nativeElement.querySelector(
+ "button.tw-text-sm.tw-font-medium.tw-cursor-pointer",
+ ) as HTMLButtonElement | null;
+
it("normalizes currentUrl and savedUrls via Utils.getHostname", () => {
expect(Utils.getHostname).toHaveBeenCalledTimes(1 + (params.savedUrls?.length ?? 0));
expect(component.currentUrl()).toBe("example.com");
@@ -191,21 +196,47 @@ describe("AutofillConfirmationDialogComponent", () => {
expect(text).toContain("two.example.com");
});
- it("shows the 'view all' button when savedUrls > 1 and toggles the button text when clicked", () => {
- const findViewAll = () =>
- fixture.nativeElement.querySelector(
- "button.tw-text-sm.tw-font-medium.tw-cursor-pointer",
- ) as HTMLButtonElement | null;
-
- let btn = findViewAll();
+ it("shows the 'show all' button when savedUrls > 1", () => {
+ const btn = findShowAll();
expect(btn).toBeTruthy();
+ expect(btn!.textContent).toContain("showAll");
+ });
+ it('hides the "show all" button when savedUrls is empty', async () => {
+ const newParams: AutofillConfirmationDialogParams = {
+ currentUrl: "https://bitwarden.com/help",
+ savedUrls: [],
+ };
+
+ const { fixture: vf } = await createFreshFixture({ params: newParams });
+ vf.detectChanges();
+ const btn = findShowAll(vf);
+ expect(btn).toBeNull();
+ });
+
+ it("handles toggling of the 'show all' button correctly", async () => {
+ const { fixture: vf, component: vc } = await createFreshFixture();
+
+ let btn = findShowAll(vf);
+ expect(btn).toBeTruthy();
+ expect(vc.savedUrlsExpanded()).toBe(false);
+ expect(btn!.textContent).toContain("showAll");
+
+ // click to expand
btn!.click();
- fixture.detectChanges();
+ vf.detectChanges();
- btn = findViewAll();
- expect(btn!.textContent).toContain("viewLess");
- expect(component.savedUrlsExpanded()).toBe(true);
+ btn = findShowAll(vf);
+ expect(btn!.textContent).toContain("showLess");
+ expect(vc.savedUrlsExpanded()).toBe(true);
+
+ // click to collapse
+ btn!.click();
+ vf.detectChanges();
+
+ btn = findShowAll(vf);
+ expect(btn!.textContent).toContain("showAll");
+ expect(vc.savedUrlsExpanded()).toBe(false);
});
it("shows autofillWithoutAdding text on autofill button when viewOnly is false", () => {