[PS-683] Update negative copy (#2912)

* feat(browser): Update auto biometrics copy

* refactor(common): remove TotpService.isAutoCopyEnabled and use state directly

The TotpService was just taking the value from StateService and forwarding it, making it depend on state service.
All services that depended on the TotpService.isAutoCopyEnable flag also depended on StateService.
This therefore simplifies things by using StateService directly.

* feat(browser): update auto totp copy

* feat(browser): update add login notification copy

* feat(browser): update change password notification copy

* feat(browser): update context menu copy

* feat(browser): update show cards current tab copy

* feat(browser): update show identities current tab copy

* feat(browser): update enable favicon copy

* feat(browser): update badge counter copy

* feat(browser): update auto-fill copy

* feat(desktop): update auto biometrics prompt copy

* feat(desktop): update favicon copy

* feat(desktop): adjust copy

* feat(web): update favicons copy

* feat(web): adjust copy

* feat(web): update preference settings to sentence case

* feat(browser): update settings and options page to sentence case

* feat(desktop): update settings to sentence case

* feat(web): update copy

* feat(desktop): update copy

apps/desktop/src/app/accounts/settings.component.html

@@ -96,16 +96,16 @@
               </div>
               <div class="form-group" *ngIf="supportsBiometric">
                 <div class="checkbox">
-                  <label for="noAutoPromptBiometrics">
+                  <label for="autoPromptBiometrics">
                     <input
-                      id="noAutoPromptBiometrics"
+                      id="autoPromptBiometrics"
                       type="checkbox"
-                      name="noAutoPromptBiometrics"
-                      [(ngModel)]="noAutoPromptBiometrics"
+                      name="autoPromptBiometrics"
+                      [(ngModel)]="autoPromptBiometrics"
                       [disabled]="!biometric"
-                      (change)="updateNoAutoPromptBiometrics()"
+                      (change)="updateAutoPromptBiometrics()"
                     />
-                    {{ noAutoPromptBiometricsText | i18n }}
+                    {{ autoPromptBiometricsText | i18n }}
                   </label>
                 </div>
               </div>
@@ -166,18 +166,18 @@
               </div>
               <div class="form-group">
                 <div class="checkbox">
-                  <label for="disableFavicons">
+                  <label for="enableFavicons">
                     <input
-                      id="disableFavicons"
+                      id="enableFavicons"
                       type="checkbox"
-                      name="DisableFavicons"
-                      [(ngModel)]="disableFavicons"
+                      name="enableFavicons"
+                      [(ngModel)]="enableFavicons"
                       (change)="saveFavicons()"
                     />
-                    {{ "disableFavicon" | i18n }}
+                    {{ "enableFavicon" | i18n }}
                   </label>
                 </div>
-                <small class="help-block">{{ "disableFaviconDesc" | i18n }}</small>
+                <small class="help-block">{{ "faviconDesc" | i18n }}</small>
               </div>
             </ng-container>
           </div>

apps/desktop/src/app/accounts/settings.component.ts

@@ -24,7 +24,7 @@ import { SetPinComponent } from "../components/set-pin.component";
 export class SettingsComponent implements OnInit {
   vaultTimeoutAction: string;
   pin: boolean = null;
-  disableFavicons = false;
+  enableFavicons = false;
   enableBrowserIntegration = false;
   enableBrowserIntegrationFingerprint = false;
   enableMinToTray = false;
@@ -43,8 +43,8 @@ export class SettingsComponent implements OnInit {
   supportsBiometric: boolean;
   biometric: boolean;
   biometricText: string;
-  noAutoPromptBiometrics: boolean;
-  noAutoPromptBiometricsText: string;
+  autoPromptBiometrics: boolean;
+  autoPromptBiometricsText: string;
   alwaysShowDock: boolean;
   showAlwaysShowDock = false;
   openAtLogin: boolean;
@@ -179,7 +179,7 @@ export class SettingsComponent implements OnInit {
     this.pin = pinSet[0] || pinSet[1];
 
     // Account preferences
-    this.disableFavicons = await this.stateService.getDisableFavicon();
+    this.enableFavicons = !(await this.stateService.getDisableFavicon());
     this.enableBrowserIntegration = await this.stateService.getEnableBrowserIntegration();
     this.enableBrowserIntegrationFingerprint =
       await this.stateService.getEnableBrowserIntegrationFingerprint();
@@ -188,8 +188,8 @@ export class SettingsComponent implements OnInit {
     this.supportsBiometric = await this.platformUtilsService.supportsBiometric();
     this.biometric = await this.vaultTimeoutService.isBiometricLockSet();
     this.biometricText = await this.stateService.getBiometricText();
-    this.noAutoPromptBiometrics = await this.stateService.getNoAutoPromptBiometrics();
-    this.noAutoPromptBiometricsText = await this.stateService.getNoAutoPromptBiometricsText();
+    this.autoPromptBiometrics = !(await this.stateService.getNoAutoPromptBiometrics());
+    this.autoPromptBiometricsText = await this.stateService.getNoAutoPromptBiometricsText();
   }
 
   async saveVaultTimeoutOptions() {
@@ -259,27 +259,27 @@ export class SettingsComponent implements OnInit {
     } else {
       await this.stateService.setBiometricUnlock(null);
       await this.stateService.setNoAutoPromptBiometrics(null);
-      this.noAutoPromptBiometrics = false;
+      this.autoPromptBiometrics = false;
     }
     await this.stateService.setBiometricLocked(false);
     await this.cryptoService.toggleKey();
   }
 
-  async updateNoAutoPromptBiometrics() {
+  async updateAutoPromptBiometrics() {
     if (!this.biometric) {
-      this.noAutoPromptBiometrics = false;
+      this.autoPromptBiometrics = false;
     }
 
-    if (this.noAutoPromptBiometrics) {
-      await this.stateService.setNoAutoPromptBiometrics(true);
-    } else {
+    if (this.autoPromptBiometrics) {
       await this.stateService.setNoAutoPromptBiometrics(null);
+    } else {
+      await this.stateService.setNoAutoPromptBiometrics(true);
     }
   }
 
   async saveFavicons() {
-    await this.stateService.setDisableFavicon(this.disableFavicons);
-    await this.stateService.setDisableFavicon(this.disableFavicons, {
+    await this.stateService.setDisableFavicon(!this.enableFavicons);
+    await this.stateService.setDisableFavicon(!this.enableFavicons, {
       storageLocation: StorageLocation.Disk,
     });
     this.messagingService.send("refreshCiphers");

apps/desktop/src/locales/en/messages.json

@@ -126,7 +126,7 @@
     "message": "Minimize when copying to clipboard"
   },
   "minimizeOnCopyToClipboardDesc": {
-    "message": "Minimize when copying an item's data to the clipboard."
+    "message": "Minimize application when copying an item's data to the clipboard."
   },
   "toggleVisibility": {
     "message": "Toggle Visibility"
@@ -728,7 +728,7 @@
     "message": "Are you sure you want to log out?"
   },
   "logOut": {
-    "message": "Log Out"
+    "message": "Log out"
   },
   "addNewLogin": {
     "message": "Add New Login"
@@ -830,10 +830,10 @@
     "message": "Two-step Login"
   },
   "vaultTimeout": {
-    "message": "Vault Timeout"
+    "message": "Vault timeout"
   },
   "vaultTimeoutDesc": {
-    "message": "Choose when your vault will timeout and perform the selected action."
+    "message": "Choose when your vault will take the vault timeout action."
   },
   "immediately": {
     "message": "Immediately"
@@ -869,16 +869,16 @@
     "message": "4 hours"
   },
   "onIdle": {
-    "message": "On System Idle"
+    "message": "On system idle"
   },
   "onSleep": {
-    "message": "On System Sleep"
+    "message": "On system sleep"
   },
   "onLocked": {
-    "message": "On System Lock"
+    "message": "On system lock"
   },
   "onRestart": {
-    "message": "On Restart"
+    "message": "On restart"
   },
   "never": {
     "message": "Never"
@@ -887,21 +887,21 @@
     "message": "Security"
   },
   "clearClipboard": {
-    "message": "Clear Clipboard",
+    "message": "Clear clipboard",
     "description": "Clipboard is the operating system thing where you copy/paste data to on your device."
   },
   "clearClipboardDesc": {
     "message": "Automatically clear copied values from your clipboard.",
     "description": "Clipboard is the operating system thing where you copy/paste data to on your device."
   },
-  "disableFavicon": {
-    "message": "Disable Website Icons"
+  "enableFavicon": {
+    "message": "Show website icons"
   },
-  "disableFaviconDesc": {
-    "message": "Website Icons provide a recognizable image next to each login item in your vault."
+  "faviconDesc": {
+    "message": "Show a recognizable image next to each login."
   },
   "enableMinToTray": {
-    "message": "Minimize to Tray Icon"
+    "message": "Minimize to tray icon"
   },
   "enableMinToTrayDesc": {
     "message": "When minimizing the window, show an icon in the system tray instead."
@@ -913,7 +913,7 @@
     "message": "When minimizing the window, show an icon in the menu bar instead."
   },
   "enableCloseToTray": {
-    "message": "Close to Tray Icon"
+    "message": "Close to tray icon"
   },
   "enableCloseToTrayDesc": {
     "message": "When closing the window, show an icon in the system tray instead."
@@ -925,13 +925,13 @@
     "message": "When closing the window, show an icon in the menu bar instead."
   },
   "enableTray": {
-    "message": "Enable Tray Icon"
+    "message": "Enable tray icon"
   },
   "enableTrayDesc": {
     "message": "Always show an icon in the system tray."
   },
   "startToTray": {
-    "message": "Start To Tray Icon"
+    "message": "Start To tray icon"
   },
   "startToTrayDesc": {
     "message": "When the application is first started, only show an icon in the system tray."
@@ -946,7 +946,7 @@
     "message": "Start automatically on login"
   },
   "openAtLoginDesc": {
-    "message": "Start the Bitwarden Desktop application automatically on login."
+    "message": "Start the Bitwarden desktop application automatically on login."
   },
   "alwaysShowDock": {
     "message": "Always show in the Dock"
@@ -1381,11 +1381,11 @@
   "touchIdConsentMessage": {
     "message": "unlock your vault"
   },
-  "noAutoPromptWindowsHello": {
-    "message": "Do not prompt for Windows Hello on launch."
+  "autoPromptWindowsHello": {
+    "message": "Ask for Windows Hello on launch"
   },
-  "noAutoPromptTouchId": {
-    "message": "Do not prompt for Touch ID on launch."
+  "autoPromptTouchId": {
+    "message": "Ask for Touch ID on launch"
   },
   "lockWithMasterPassOnRestart": {
     "message": "Lock with master password on restart"
@@ -1394,7 +1394,7 @@
     "message": "Preferences"
   },
   "enableMenuBar": {
-    "message": "Enable Menu Bar Icon"
+    "message": "Show menu bar icon"
   },
   "enableMenuBarDesc": {
     "message": "Always show an icon in the menu bar."
@@ -1437,13 +1437,13 @@
     "message": "One or more organization policies are affecting your generator settings."
   },
   "vaultTimeoutAction": {
-    "message": "Vault Timeout Action"
+    "message": "Vault timeout action"
   },
   "vaultTimeoutActionLockDesc": {
-    "message": "A locked vault requires that you re-enter your master password to access it again."
+    "message": "Master password or other unlock method is required to access your vault again."
   },
   "vaultTimeoutActionLogOutDesc": {
-    "message": "A logged out vault requires that you re-authenticate to access it again."
+    "message": "Re-authentication is required to access your vault again."
   },
   "lock": {
     "message": "Lock",
@@ -1547,7 +1547,7 @@
     "message": "Terms of Service and Privacy Policy have not been acknowledged."
   },
   "enableBrowserIntegration": {
-    "message": "Enable browser integration"
+    "message": "Allow browser integration"
   },
   "enableBrowserIntegrationDesc": {
     "message": "Browser integration is used for biometrics in browser."
@@ -1568,7 +1568,7 @@
     "message": "Require verification for browser integration"
   },
   "enableBrowserIntegrationFingerprintDesc": {
-    "message": "Enable an additional layer of security by requiring fingerprint phrase validation when establishing a link between your desktop and browser. When enabled, this requires user intervention and verification each time a connection is established."
+    "message": "Add an additional layer of security by requiring fingerprint phrase confirmation when establishing a link between your desktop and browser. This requires user action and verification each time a connection is created."
   },
   "approve": {
     "message": "Approve"

apps/desktop/src/main/biometric/biometric.darwin.main.ts

@@ -13,7 +13,7 @@ export default class BiometricDarwinMain implements BiometricMain {
   async init() {
     await this.stateService.setEnableBiometric(await this.supportsBiometric());
     await this.stateService.setBiometricText("unlockWithTouchId");
-    await this.stateService.setNoAutoPromptBiometricsText("noAutoPromptTouchId");
+    await this.stateService.setNoAutoPromptBiometricsText("autoPromptTouchId");
 
     // eslint-disable-next-line
     ipcMain.on("biometric", async (event: any, message: any) => {

apps/desktop/src/main/biometric/biometric.windows.main.ts

@@ -31,7 +31,7 @@ export default class BiometricWindowsMain implements BiometricMain {
     }
     await this.stateService.setEnableBiometric(supportsBiometric);
     await this.stateService.setBiometricText("unlockWithWindowsHello");
-    await this.stateService.setNoAutoPromptBiometricsText("noAutoPromptWindowsHello");
+    await this.stateService.setNoAutoPromptBiometricsText("autoPromptWindowsHello");
 
     ipcMain.on("biometric", async (event: any, message: any) => {
       event.returnValue = await this.authenticateBiometric();