From e7b2557bcd5f69396ad8c097f97d99ab8e408451 Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Tue, 4 Jun 2019 00:06:15 -0400
Subject: [PATCH] logged in as on

---
 jslib                                | 2 +-
 src/app/accounts/lock.component.html | 4 +++-
 src/app/accounts/lock.component.ts   | 5 +++--
 src/locales/en/messages.json         | 8 ++++++--
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/jslib b/jslib
index cd46f64993..802d38f52e 160000
--- a/jslib
+++ b/jslib
@@ -1 +1 @@
-Subproject commit cd46f64993545a1cb772e2f6a2137a675554f3c3
+Subproject commit 802d38f52e9794567179b9bd9ffc475ceb31323f
diff --git a/src/app/accounts/lock.component.html b/src/app/accounts/lock.component.html
index bb6dc0c26e..79570be25a 100644
--- a/src/app/accounts/lock.component.html
+++ b/src/app/accounts/lock.component.html
@@ -19,7 +19,9 @@
                                     [ngClass]="{'fa-eye': !showPassword, 'fa-eye-slash': showPassword}"></i>
                             </button>
                         </div>
-                        <small class="text-muted form-text">{{'loggedInAsEmail' | i18n : email}}</small>
+                        <small class="text-muted form-text">
+                            {{'loggedInAsEmailOn' | i18n : email : webVaultHostname}}
+                        </small>
                     </div>
                     <hr>
                     <div class="d-flex">
diff --git a/src/app/accounts/lock.component.ts b/src/app/accounts/lock.component.ts
index 7356f8abe8..f5caec9d25 100644
--- a/src/app/accounts/lock.component.ts
+++ b/src/app/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';
@@ -22,9 +23,9 @@ export class LockComponent extends BaseLockComponent {
         platformUtilsService: PlatformUtilsService, messagingService: MessagingService,
         userService: UserService, cryptoService: CryptoService,
         storageService: StorageService, lockService: LockService,
-        private routerService: RouterService) {
+         environmentService: EnvironmentService, private routerService: RouterService) {
         super(router, i18nService, platformUtilsService, messagingService, userService, cryptoService,
-            storageService, lockService);
+            storageService, lockService, environmentService);
     }
 
     async ngOnInit() {
diff --git a/src/locales/en/messages.json b/src/locales/en/messages.json
index f84f992d51..69606ea225 100644
--- a/src/locales/en/messages.json
+++ b/src/locales/en/messages.json
@@ -589,12 +589,16 @@
   "unlock": {
     "message": "Unlock"
   },
-  "loggedInAsEmail": {
-    "message": "Logged in as $EMAIL$.",
+  "loggedInAsEmailOn": {
+    "message": "Logged in as $EMAIL$ on $HOSTNAME$.",
     "placeholders": {
       "email": {
         "content": "$1",
         "example": "name@example.com"
+      },
+      "hostname": {
+        "content": "$2",
+        "example": "bitwarden.com"
       }
     }
   },