From 651593bcd2e43ab61e7dc9b2ccbe4c391b542c71 Mon Sep 17 00:00:00 2001 From: rr-bw <102181210+rr-bw@users.noreply.github.com> Date: Mon, 20 Nov 2023 17:53:03 -0800 Subject: [PATCH] [PM-4420] Browser Settings Changes (#6902) * update copy on /settings and /options (behind feature flag) * update copy on /excluded-domains (behind feature flag) * use && two check both conditions for presence of lock() button * fix typos in messages * add description on auto-fill page --- apps/browser/src/_locales/en/messages.json | 20 +++++++++++++++- .../popup/settings/autofill.component.html | 3 +++ .../src/popup/settings/autofill.component.ts | 4 ++++ .../settings/excluded-domains.component.html | 10 +++++--- .../settings/excluded-domains.component.ts | 6 ++++- .../src/popup/settings/options.component.html | 24 +++++++++++++++---- .../src/popup/settings/options.component.ts | 5 ++++ .../popup/settings/settings.component.html | 5 +++- .../src/popup/settings/settings.component.ts | 6 ++++- 9 files changed, 72 insertions(+), 11 deletions(-) diff --git a/apps/browser/src/_locales/en/messages.json b/apps/browser/src/_locales/en/messages.json index 1c1f43af8e2..af2de0643ed 100644 --- a/apps/browser/src/_locales/en/messages.json +++ b/apps/browser/src/_locales/en/messages.json @@ -619,6 +619,9 @@ "addLoginNotificationDesc": { "message": "Ask to add an item if one isn't found in your vault." }, + "addLoginNotificationDescAlt": { + "message": "Ask to add an item if one isn't found in your vault. Applies to all logged in accounts." + }, "showCardsCurrentTab": { "message": "Show cards on Tab page" }, @@ -651,6 +654,9 @@ "changedPasswordNotificationDesc": { "message": "Ask to update a login's password when a change is detected on a website." }, + "changedPasswordNotificationDescAlt": { + "message": "Ask to update a login's password when a change is detected on a website. Applies to all logged in accounts." + }, "notificationChangeDesc": { "message": "Do you want to update this password in Bitwarden?" }, @@ -667,7 +673,10 @@ "message": "Show context menu options" }, "contextMenuItemDesc": { - "message": "Use a secondary click to access password generation and matching logins for the website. " + "message": "Use a secondary click to access password generation and matching logins for the website." + }, + "contextMenuItemDescAlt": { + "message": "Use a secondary click to access password generation and matching logins for the website. Applies to all logged in accounts." }, "defaultUriMatchDetection": { "message": "Default URI match detection", @@ -682,6 +691,9 @@ "themeDesc": { "message": "Change the application's color theme." }, + "themeDescAlt": { + "message": "Change the application's color theme. Applies to all logged in accounts." + }, "dark": { "message": "Dark", "description": "Dark color" @@ -1006,6 +1018,9 @@ "message": "Show auto-fill menu on form fields", "description": "Represents the message for allowing the user to enable the auto-fill overlay" }, + "showAutoFillMenuOnFormFieldsDescAlt": { + "message": "Applies to all logged in accounts." + }, "autofillOverlayVisibilityOff": { "message": "Off", "description": "Overlay setting select option for disabling autofill overlay" @@ -1678,6 +1693,9 @@ "excludedDomainsDesc": { "message": "Bitwarden will not ask to save login details for these domains. You must refresh the page for changes to take effect." }, + "excludedDomainsDescAlt": { + "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." + }, "excludedDomainsInvalidDomain": { "message": "$DOMAIN$ is not a valid domain", "placeholders": { diff --git a/apps/browser/src/popup/settings/autofill.component.html b/apps/browser/src/popup/settings/autofill.component.html index 3de41bfff9a..9204add4458 100644 --- a/apps/browser/src/popup/settings/autofill.component.html +++ b/apps/browser/src/popup/settings/autofill.component.html @@ -42,6 +42,9 @@ +
+ {{ "showAutoFillMenuOnFormFieldsDescAlt" | i18n }} +
diff --git a/apps/browser/src/popup/settings/autofill.component.ts b/apps/browser/src/popup/settings/autofill.component.ts index b4a6c3efe00..17cbf60502f 100644 --- a/apps/browser/src/popup/settings/autofill.component.ts +++ b/apps/browser/src/popup/settings/autofill.component.ts @@ -11,6 +11,7 @@ import { DialogService } from "@bitwarden/components"; import { AutofillOverlayVisibility } from "../../autofill/utils/autofill-overlay.enum"; import { BrowserApi } from "../../platform/browser/browser-api"; +import { flagEnabled } from "../../platform/flags"; @Component({ selector: "app-autofill", @@ -28,6 +29,7 @@ export class AutofillComponent implements OnInit { defaultUriMatch = UriMatchType.Domain; uriMatchOptions: any[]; autofillKeyboardHelperText: string; + accountSwitcherEnabled = false; constructor( private stateService: StateService, @@ -63,6 +65,8 @@ export class AutofillComponent implements OnInit { { name: i18nService.t("exact"), value: UriMatchType.Exact }, { name: i18nService.t("never"), value: UriMatchType.Never }, ]; + + this.accountSwitcherEnabled = flagEnabled("accountSwitching"); } async ngOnInit() { diff --git a/apps/browser/src/popup/settings/excluded-domains.component.html b/apps/browser/src/popup/settings/excluded-domains.component.html index 87a3f0a042b..51d6a20d5be 100644 --- a/apps/browser/src/popup/settings/excluded-domains.component.html +++ b/apps/browser/src/popup/settings/excluded-domains.component.html @@ -16,6 +16,13 @@
+
+ {{ + accountSwitcherEnabled + ? ("excludedDomainsDescAlt" | i18n) + : ("excludedDomainsDesc" | i18n) + }} +
-
- {{ "excludedDomainsDesc" | i18n }} -
diff --git a/apps/browser/src/popup/settings/excluded-domains.component.ts b/apps/browser/src/popup/settings/excluded-domains.component.ts index 7adedd72240..dfed6879588 100644 --- a/apps/browser/src/popup/settings/excluded-domains.component.ts +++ b/apps/browser/src/popup/settings/excluded-domains.component.ts @@ -8,6 +8,7 @@ import { StateService } from "@bitwarden/common/platform/abstractions/state.serv import { Utils } from "@bitwarden/common/platform/misc/utils"; import { BrowserApi } from "../../platform/browser/browser-api"; +import { flagEnabled } from "../../platform/flags"; interface ExcludedDomain { uri: string; @@ -25,6 +26,7 @@ export class ExcludedDomainsComponent implements OnInit, OnDestroy { existingExcludedDomains: ExcludedDomain[] = []; currentUris: string[]; loadCurrentUrisTimeout: number; + accountSwitcherEnabled = false; constructor( private stateService: StateService, @@ -33,7 +35,9 @@ export class ExcludedDomainsComponent implements OnInit, OnDestroy { private broadcasterService: BroadcasterService, private ngZone: NgZone, private platformUtilsService: PlatformUtilsService - ) {} + ) { + this.accountSwitcherEnabled = flagEnabled("accountSwitching"); + } async ngOnInit() { const savedDomains = await this.stateService.getNeverDomains(); diff --git a/apps/browser/src/popup/settings/options.component.html b/apps/browser/src/popup/settings/options.component.html index a356be5f735..db9a29fa119 100644 --- a/apps/browser/src/popup/settings/options.component.html +++ b/apps/browser/src/popup/settings/options.component.html @@ -74,7 +74,11 @@
@@ -93,7 +97,11 @@
@@ -109,7 +117,13 @@ />
- +
@@ -206,7 +220,9 @@
- + diff --git a/apps/browser/src/popup/settings/options.component.ts b/apps/browser/src/popup/settings/options.component.ts index b020816158c..b23fefbf646 100644 --- a/apps/browser/src/popup/settings/options.component.ts +++ b/apps/browser/src/popup/settings/options.component.ts @@ -8,6 +8,8 @@ import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.servic import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service"; import { StateService } from "@bitwarden/common/platform/abstractions/state.service"; +import { flagEnabled } from "../../platform/flags"; + @Component({ selector: "app-options", templateUrl: "options.component.html", @@ -34,6 +36,7 @@ export class OptionsComponent implements OnInit { showGeneral = true; showAutofill = true; showDisplay = true; + accountSwitcherEnabled = false; constructor( private messagingService: MessagingService, @@ -71,6 +74,8 @@ export class OptionsComponent implements OnInit { { name: i18nService.t("autoFillOnPageLoadYes"), value: true }, { name: i18nService.t("autoFillOnPageLoadNo"), value: false }, ]; + + this.accountSwitcherEnabled = flagEnabled("accountSwitching"); } async ngOnInit() { diff --git a/apps/browser/src/popup/settings/settings.component.html b/apps/browser/src/popup/settings/settings.component.html index f96a7ffdb7c..0b752ac6ce6 100644 --- a/apps/browser/src/popup/settings/settings.component.html +++ b/apps/browser/src/popup/settings/settings.component.html @@ -109,7 +109,9 @@ />