From 2686be0e50d122349711c5b5834e5509ee25f91a Mon Sep 17 00:00:00 2001 From: Jonathan Prusik Date: Mon, 11 Nov 2024 17:05:39 -0500 Subject: [PATCH] update copy --- apps/browser/src/_locales/en/messages.json | 5 +---- .../autofill/popup/settings/blocked-domains.component.html | 6 +----- .../autofill/popup/settings/blocked-domains.component.ts | 6 +----- 3 files changed, 3 insertions(+), 14 deletions(-) diff --git a/apps/browser/src/_locales/en/messages.json b/apps/browser/src/_locales/en/messages.json index 6367a5721cc..4ec1a97abbc 100644 --- a/apps/browser/src/_locales/en/messages.json +++ b/apps/browser/src/_locales/en/messages.json @@ -2337,10 +2337,7 @@ "message": "Bitwarden will not ask to save login details for these domains for all logged in accounts. You must refresh the page for changes to take effect." }, "blockedDomainsDesc": { - "message": "Bitwarden will be disabled for these domains. You must refresh the page for changes to take effect." - }, - "blockedDomainsDescAlt": { - "message": "Bitwarden will be disabled for these domains on all logged in accounts. You must refresh the page for changes to take effect." + "message": "Autofill and other related features will not be offered for these websites. You must refresh the page for changes to take effect." }, "websiteItemLabel": { "message": "Website $number$ (URI)", diff --git a/apps/browser/src/autofill/popup/settings/blocked-domains.component.html b/apps/browser/src/autofill/popup/settings/blocked-domains.component.html index f8c72b76a57..bf5f40f2b90 100644 --- a/apps/browser/src/autofill/popup/settings/blocked-domains.component.html +++ b/apps/browser/src/autofill/popup/settings/blocked-domains.component.html @@ -6,11 +6,7 @@
-

- {{ - accountSwitcherEnabled ? ("blockedDomainsDescAlt" | i18n) : ("blockedDomainsDesc" | i18n) - }} -

+

{{ "blockedDomainsDesc" | i18n }}

{{ "domainsTitle" | i18n }}

diff --git a/apps/browser/src/autofill/popup/settings/blocked-domains.component.ts b/apps/browser/src/autofill/popup/settings/blocked-domains.component.ts index 4861dc8387f..de5707f5c6f 100644 --- a/apps/browser/src/autofill/popup/settings/blocked-domains.component.ts +++ b/apps/browser/src/autofill/popup/settings/blocked-domains.component.ts @@ -29,7 +29,6 @@ import { TypographyModule, } from "@bitwarden/components"; -import { enableAccountSwitching } from "../../../platform/flags"; 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"; @@ -62,7 +61,6 @@ import { PopupPageComponent } from "../../../platform/popup/layout/popup-page.co export class BlockedDomainsComponent implements AfterViewInit, OnDestroy { @ViewChildren("uriInput") uriInputElements: QueryList>; - accountSwitcherEnabled = false; dataIsPristine = true; isLoading = false; blockedDomainsState: string[] = []; @@ -76,9 +74,7 @@ export class BlockedDomainsComponent implements AfterViewInit, OnDestroy { private domainSettingsService: DomainSettingsService, private i18nService: I18nService, private platformUtilsService: PlatformUtilsService, - ) { - this.accountSwitcherEnabled = enableAccountSwitching(); - } + ) {} async ngAfterViewInit() { this.domainSettingsService.blockedInteractionsUris$