diff --git a/jslib b/jslib index 38fc0432c3..802d38f52e 160000 --- a/jslib +++ b/jslib @@ -1 +1 @@ -Subproject commit 38fc0432c3b352628b0114ac98b49ca69ee01675 +Subproject commit 802d38f52e9794567179b9bd9ffc475ceb31323f diff --git a/src/_locales/en/messages.json b/src/_locales/en/messages.json index 648308c2e2..d4a3af162c 100644 --- a/src/_locales/en/messages.json +++ b/src/_locales/en/messages.json @@ -298,12 +298,16 @@ "unlock": { "message": "Unlock" }, - "loggedInAs": { - "message": "Logged in as $EMAIL$.", + "loggedInAsOn": { + "message": "Logged in as $EMAIL$ on $HOSTNAME$.", "placeholders": { "email": { "content": "$1", "example": "name@example.com" + }, + "hostname": { + "content": "$2", + "example": "bitwarden.com" } } }, diff --git a/src/popup/accounts/lock.component.html b/src/popup/accounts/lock.component.html index d2f96fed1d..37bf7299a5 100644 --- a/src/popup/accounts/lock.component.html +++ b/src/popup/accounts/lock.component.html @@ -32,7 +32,7 @@

diff --git a/src/popup/accounts/lock.component.ts b/src/popup/accounts/lock.component.ts index 9cbe5ce4c7..8344000c16 100644 --- a/src/popup/accounts/lock.component.ts +++ b/src/popup/accounts/lock.component.ts @@ -2,6 +2,7 @@ import { Component } from '@angular/core'; import { Router } from '@angular/router'; import { CryptoService } from 'jslib/abstractions/crypto.service'; +import { EnvironmentService } from 'jslib/abstractions/environment.service'; import { I18nService } from 'jslib/abstractions/i18n.service'; import { LockService } from 'jslib/abstractions/lock.service'; import { MessagingService } from 'jslib/abstractions/messaging.service'; @@ -19,9 +20,10 @@ export class LockComponent extends BaseLockComponent { constructor(router: Router, i18nService: I18nService, platformUtilsService: PlatformUtilsService, messagingService: MessagingService, userService: UserService, cryptoService: CryptoService, - storageService: StorageService, lockService: LockService) { + storageService: StorageService, lockService: LockService, + environmentService: EnvironmentService) { super(router, i18nService, platformUtilsService, messagingService, userService, cryptoService, - storageService, lockService); + storageService, lockService, environmentService); this.successRoute = '/tabs/current'; }