From bccb77356b48da927ad0d62aaaf69c8c531418b2 Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Tue, 8 Jan 2019 00:21:28 -0500
Subject: [PATCH] lock screen message improvements

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

diff --git a/jslib b/jslib
index e7464785e13..65bd33d860f 160000
--- a/jslib
+++ b/jslib
@@ -1 +1 @@
-Subproject commit e7464785e134e5d723a4901cf54c5dd1668efb5c
+Subproject commit 65bd33d860f3af71968a15e78491221091c4369e
diff --git a/src/app/accounts/lock.component.html b/src/app/accounts/lock.component.html
index 1abf04fca0f..208a4953c6f 100644
--- a/src/app/accounts/lock.component.html
+++ b/src/app/accounts/lock.component.html
@@ -19,6 +19,9 @@
                     </div>
                 </div>
             </div>
+            <div class="box-footer">
+                {{'loggedInAs' | i18n : email}}
+            </div>
         </div>
         <div class="buttons">
             <button type="submit" class="btn primary block" appBlurClick>
diff --git a/src/app/accounts/lock.component.ts b/src/app/accounts/lock.component.ts
index 94da6a1ec21..3127e643f5d 100644
--- a/src/app/accounts/lock.component.ts
+++ b/src/app/accounts/lock.component.ts
@@ -2,7 +2,6 @@ import {
     Component,
     NgZone,
     OnDestroy,
-    OnInit,
 } from '@angular/core';
 import {
     ActivatedRoute,
@@ -24,7 +23,7 @@ import { LockComponent as BaseLockComponent } from 'jslib/angular/components/loc
     selector: 'app-lock',
     templateUrl: 'lock.component.html',
 })
-export class LockComponent extends BaseLockComponent implements OnInit, OnDestroy {
+export class LockComponent extends BaseLockComponent implements OnDestroy {
     private reloadInterval: number = null;
 
     constructor(router: Router, i18nService: I18nService,
@@ -35,7 +34,8 @@ export class LockComponent extends BaseLockComponent implements OnInit, OnDestro
         super(router, i18nService, platformUtilsService, messagingService, userService, cryptoService);
     }
 
-    ngOnInit() {
+    async ngOnInit() {
+        await super.ngOnInit();
         this.route.queryParams.subscribe((params) => {
             if (params.refresh === 'true') {
                 // Refresh the renderer window when locked to enure that all purged memory is cleaned up
diff --git a/src/locales/en/messages.json b/src/locales/en/messages.json
index 838a3b58d62..6b280e2658e 100644
--- a/src/locales/en/messages.json
+++ b/src/locales/en/messages.json
@@ -734,6 +734,15 @@
   "unlock": {
     "message": "Unlock"
   },
+  "loggedInAs": {
+    "message": "Logged in as $EMAIL$.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "name@example.com"
+      }
+    }
+  },
   "invalidMasterPassword": {
     "message": "Invalid master password"
   },