diff --git a/apps/web/src/app/settings/preferences.component.ts b/apps/web/src/app/settings/preferences.component.ts
index 5431ba4530..f02ed55fdb 100644
--- a/apps/web/src/app/settings/preferences.component.ts
+++ b/apps/web/src/app/settings/preferences.component.ts
@@ -15,7 +15,7 @@ import { Utils } from "@bitwarden/common/misc/utils";
})
export class PreferencesComponent implements OnInit {
vaultTimeoutAction = "lock";
- disableIcons: boolean;
+ enableFavicons: boolean;
enableGravatars: boolean;
enableFullWidth: boolean;
theme: ThemeType;
@@ -70,7 +70,7 @@ export class PreferencesComponent implements OnInit {
async ngOnInit() {
this.vaultTimeout.setValue(await this.vaultTimeoutService.getVaultTimeout());
this.vaultTimeoutAction = await this.stateService.getVaultTimeoutAction();
- this.disableIcons = await this.stateService.getDisableFavicon();
+ this.enableFavicons = !(await this.stateService.getDisableFavicon());
this.enableGravatars = await this.stateService.getEnableGravitars();
this.enableFullWidth = await this.stateService.getEnableFullWidth();
@@ -95,7 +95,7 @@ export class PreferencesComponent implements OnInit {
this.vaultTimeout.value,
this.vaultTimeoutAction
);
- await this.stateService.setDisableFavicon(this.disableIcons);
+ await this.stateService.setDisableFavicon(!this.enableFavicons);
await this.stateService.setEnableGravitars(this.enableGravatars);
await this.stateService.setEnableFullWidth(this.enableFullWidth);
this.messagingService.send("setFullWidth");
diff --git a/apps/web/src/locales/en/messages.json b/apps/web/src/locales/en/messages.json
index 0a4408d682..0e32e2dd53 100644
--- a/apps/web/src/locales/en/messages.json
+++ b/apps/web/src/locales/en/messages.json
@@ -555,7 +555,7 @@
"message": "Are you sure you want to log out?"
},
"logOut": {
- "message": "Log Out"
+ "message": "Log out"
},
"ok": {
"message": "Ok"
@@ -1151,21 +1151,21 @@
"languageDesc": {
"message": "Change the language used by the web vault."
},
- "disableIcons": {
- "message": "Disable Website Icons"
+ "enableFavicon": {
+ "message": "Show website icons"
},
- "disableIconsDesc": {
- "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."
},
"enableGravatars": {
- "message": "Enable Gravatars",
- "description": "'Gravatar' is the name of a service. See www.gravatar.com"
+ "message": "Show Gravatars",
+ "description": "Use avatar images loaded from gravatar.com."
},
"enableGravatarsDesc": {
"message": "Use avatar images loaded from gravatar.com."
},
"enableFullWidth": {
- "message": "Enable Full Width Layout",
+ "message": "Display full width layout",
"description": "Allows scaling the web vault UI's width"
},
"enableFullWidthDesc": {
@@ -3172,10 +3172,10 @@
"message": "Filters"
},
"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."
},
"oneMinute": {
"message": "1 minute"
@@ -3196,7 +3196,7 @@
"message": "4 hours"
},
"onRefresh": {
- "message": "On Browser Refresh"
+ "message": "On browser refresh"
},
"dateUpdated": {
"message": "Updated",
@@ -3403,13 +3403,13 @@
"message": "User Preference"
},
"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",
diff --git a/libs/common/src/abstractions/totp.service.ts b/libs/common/src/abstractions/totp.service.ts
index bf143e269c..729588aba4 100644
--- a/libs/common/src/abstractions/totp.service.ts
+++ b/libs/common/src/abstractions/totp.service.ts
@@ -1,5 +1,4 @@
export abstract class TotpService {
getCode: (key: string) => Promise;
getTimeInterval: (key: string) => number;
- isAutoCopyEnabled: () => Promise;
}
diff --git a/libs/common/src/services/totp.service.ts b/libs/common/src/services/totp.service.ts
index 730587c77f..3264c598df 100644
--- a/libs/common/src/services/totp.service.ts
+++ b/libs/common/src/services/totp.service.ts
@@ -1,6 +1,5 @@
import { CryptoFunctionService } from "../abstractions/cryptoFunction.service";
import { LogService } from "../abstractions/log.service";
-import { StateService } from "../abstractions/state.service";
import { TotpService as TotpServiceAbstraction } from "../abstractions/totp.service";
import { Utils } from "../misc/utils";
@@ -10,8 +9,7 @@ const SteamChars = "23456789BCDFGHJKMNPQRTVWXY";
export class TotpService implements TotpServiceAbstraction {
constructor(
private cryptoFunctionService: CryptoFunctionService,
- private logService: LogService,
- private stateService: StateService
+ private logService: LogService
) {}
async getCode(key: string): Promise {
@@ -113,10 +111,6 @@ export class TotpService implements TotpServiceAbstraction {
return period;
}
- async isAutoCopyEnabled(): Promise {
- return !(await this.stateService.getDisableAutoTotpCopy());
- }
-
// Helpers
private leftPad(s: string, l: number, p: string): string {