1
0
mirror of https://github.com/bitwarden/browser synced 2025-12-17 00:33:44 +00:00

Merge branch 'master' of https://github.com/bitwarden/browser into feature/hidden-password

This commit is contained in:
Hinton
2020-06-11 20:35:30 +02:00
20 changed files with 133 additions and 130 deletions

View File

@@ -445,13 +445,15 @@ export default class MainBackground {
title: this.i18nService.t('copyPassword'),
});
await this.contextMenusCreate({
type: 'normal',
id: 'copy-totp',
parentId: 'root',
contexts: ['all'],
title: this.i18nService.t('copyVerificationCode'),
});
if (await this.userService.canAccessPremium()) {
await this.contextMenusCreate({
type: 'normal',
id: 'copy-totp',
parentId: 'root',
contexts: ['all'],
title: this.i18nService.t('copyVerificationCode'),
});
}
await this.contextMenusCreate({
type: 'separator',
@@ -587,7 +589,8 @@ export default class MainBackground {
});
}
if (cipher == null || (cipher.login.totp && cipher.login.totp !== '')) {
const canAccessPremium = await this.userService.canAccessPremium();
if (canAccessPremium && (cipher == null || (cipher.login.totp && cipher.login.totp !== ''))) {
await this.contextMenusCreate({
type: 'normal',
id: 'copy-totp_' + idSuffix,