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

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

diff --git a/jslib b/jslib
index e7464785e1..65bd33d860 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 71fa5438ef..e3cea7f6cd 100644
--- a/src/app/accounts/lock.component.html
+++ b/src/app/accounts/lock.component.html
@@ -16,6 +16,7 @@
                                 <i class="fa fa-lg" [ngClass]="{'fa-eye': !showPassword, 'fa-eye-slash': showPassword}"></i>
                             </button>
                         </div>
+                        <small class="text-muted form-text">{{'loggedInAsEmail' | i18n : email}}</small>
                     </div>
                     <hr>
                     <div class="d-flex">
diff --git a/src/app/accounts/lock.component.ts b/src/app/accounts/lock.component.ts
index a63fbaa21a..9ecf6de3ef 100644
--- a/src/app/accounts/lock.component.ts
+++ b/src/app/accounts/lock.component.ts
@@ -1,7 +1,4 @@
-import {
-    Component,
-    OnInit,
-} from '@angular/core';
+import { Component } from '@angular/core';
 import { Router } from '@angular/router';
 
 import { CryptoService } from 'jslib/abstractions/crypto.service';
@@ -18,7 +15,7 @@ import { LockComponent as BaseLockComponent } from 'jslib/angular/components/loc
     selector: 'app-lock',
     templateUrl: 'lock.component.html',
 })
-export class LockComponent extends BaseLockComponent implements OnInit {
+export class LockComponent extends BaseLockComponent {
     constructor(router: Router, i18nService: I18nService,
         platformUtilsService: PlatformUtilsService, messagingService: MessagingService,
         userService: UserService, cryptoService: CryptoService,
@@ -27,6 +24,7 @@ export class LockComponent extends BaseLockComponent implements OnInit {
     }
 
     async ngOnInit() {
+        await super.ngOnInit();
         const authed = await this.userService.isAuthenticated();
         if (!authed) {
             this.router.navigate(['/']);
diff --git a/src/locales/en/messages.json b/src/locales/en/messages.json
index c8e82f7ca2..4ed947ed8f 100644
--- a/src/locales/en/messages.json
+++ b/src/locales/en/messages.json
@@ -589,6 +589,15 @@
   "unlock": {
     "message": "Unlock"
   },
+  "loggedInAsEmail": {
+    "message": "Logged in as $EMAIL$.",
+    "placeholders": {
+      "email": {
+        "content": "$1",
+        "example": "name@example.com"
+      }
+    }
+  },
   "invalidMasterPassword": {
     "message": "Invalid master password"
   },