From 28d54dab29241daeb1d8887fa39bd495493fde6d Mon Sep 17 00:00:00 2001
From: Daniel James Smith <djsmith@web.de>
Date: Sun, 21 Nov 2021 13:03:18 +0100
Subject: [PATCH 1/3] Pull in jslib

---
 jslib | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jslib b/jslib
index fc0d624621..b4f475251a 160000
--- a/jslib
+++ b/jslib
@@ -1 +1 @@
-Subproject commit fc0d6246215f6154c2d566e44f6ddbe8eaa056e6
+Subproject commit b4f475251aa6817403117b71fb5a8836cdae9c75

From 1af712df0448264698cf355c32f6e0e59e98cf76 Mon Sep 17 00:00:00 2001
From: Daniel James Smith <djsmith@web.de>
Date: Sun, 21 Nov 2021 13:04:07 +0100
Subject: [PATCH 2/3] Hide password input when using key connector

---
 src/_locales/en/messages.json          | 6 +++---
 src/popup/accounts/lock.component.html | 9 +++++----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/_locales/en/messages.json b/src/_locales/en/messages.json
index d6d924726a..825826cb36 100644
--- a/src/_locales/en/messages.json
+++ b/src/_locales/en/messages.json
@@ -320,11 +320,11 @@
   "browserNotSupportClipboard": {
     "message": "Your web browser does not support easy clipboard copying. Copy it manually instead."
   },
-  "verifyMasterPassword": {
-    "message": "Verify Master Password"
+  "verifyIdentity": {
+    "message": "Verify Identity"
   },
   "yourVaultIsLocked": {
-    "message": "Your vault is locked. Verify your master password to continue."
+    "message": "Your vault is locked. Verify your identity to continue."
   },
   "unlock": {
     "message": "Unlock"
diff --git a/src/popup/accounts/lock.component.html b/src/popup/accounts/lock.component.html
index 1b7da04eae..5df98b2a15 100644
--- a/src/popup/accounts/lock.component.html
+++ b/src/popup/accounts/lock.component.html
@@ -2,16 +2,16 @@
     <header>
         <div class="left"></div>
         <div class="center">
-            <span class="title">{{(pinLock ? 'verifyPin' : 'verifyMasterPassword') | i18n}}</span>
+            <span class="title">{{(pinLock ? 'verifyPin' : 'verifyIdentity') | i18n}}</span>
         </div>
         <div class="right">
-            <button type="submit" appBlurClick>{{'unlock' | i18n}}</button>
+            <button type="submit" appBlurClick *ngIf="!hideInput">{{'unlock' | i18n}}</button>
         </div>
     </header>
     <content>
         <div class="box">
             <div class="box-content">
-                <div class="box-content-row box-content-row-flex" appBoxRow>
+                <div class="box-content-row box-content-row-flex" appBoxRow *ngIf="!hideInput">
                     <div class="row-main" *ngIf="pinLock">
                         <label for="pin">{{'pin' | i18n}}</label>
                         <input id="pin" type="{{showPassword ? 'text' : 'password'}}" name="PIN" class="monospaced"
@@ -38,7 +38,8 @@
         </div>
         <div class="box" *ngIf="biometricLock">
             <div class="box-footer">
-                <button type="button" class="btn primary block" (click)="unlockBiometric()" appStopClick>{{'unlockWithBiometrics' | i18n}}</button>
+                <button type="button" class="btn primary block" (click)="unlockBiometric()"
+                    appStopClick>{{'unlockWithBiometrics' | i18n}}</button>
             </div>
         </div>
         <p class="text-center">

From fdbcf81d2b8d02c9c18c34d31930e0b12864b58b Mon Sep 17 00:00:00 2001
From: Daniel James Smith <djsmith@web.de>
Date: Mon, 22 Nov 2021 17:20:08 +0100
Subject: [PATCH 3/3] Condensed text to verifyIdentity instead of different
 text for pin and no pin

---
 src/_locales/en/messages.json          | 6 ------
 src/popup/accounts/lock.component.html | 4 ++--
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/_locales/en/messages.json b/src/_locales/en/messages.json
index 825826cb36..2f663cabc6 100644
--- a/src/_locales/en/messages.json
+++ b/src/_locales/en/messages.json
@@ -1332,12 +1332,6 @@
   "invalidPin": {
     "message": "Invalid PIN code."
   },
-  "verifyPin": {
-    "message": "Verify PIN"
-  },
-  "yourVaultIsLockedPinCode": {
-    "message": "Your vault is locked. Verify your PIN code to continue."
-  },
   "unlockWithBiometrics": {
     "message": "Unlock with biometrics"
   },
diff --git a/src/popup/accounts/lock.component.html b/src/popup/accounts/lock.component.html
index 5df98b2a15..603b1ef389 100644
--- a/src/popup/accounts/lock.component.html
+++ b/src/popup/accounts/lock.component.html
@@ -2,7 +2,7 @@
     <header>
         <div class="left"></div>
         <div class="center">
-            <span class="title">{{(pinLock ? 'verifyPin' : 'verifyIdentity') | i18n}}</span>
+            <span class="title">{{'verifyIdentity' | i18n}}</span>
         </div>
         <div class="right">
             <button type="submit" appBlurClick *ngIf="!hideInput">{{'unlock' | i18n}}</button>
@@ -32,7 +32,7 @@
                 </div>
             </div>
             <div class="box-footer">
-                <p>{{(pinLock ? 'yourVaultIsLockedPinCode' : 'yourVaultIsLocked') | i18n}}</p>
+                <p>{{'yourVaultIsLocked' | i18n}}</p>
                 {{'loggedInAsOn' | i18n : email : webVaultHostname}}
             </div>
         </div>