From 8b8bd88adf6b25ca973f9272ecc24ba56a2210ce Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Mon, 30 Jul 2018 22:02:01 -0400
Subject: [PATCH] control when password history shows

---
 jslib                                 | 2 +-
 src/app/vault/add-edit.component.html | 9 ++++-----
 src/app/vault/add-edit.component.ts   | 6 ++++--
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/jslib b/jslib
index cfa4664b31..13769a7fcb 160000
--- a/jslib
+++ b/jslib
@@ -1 +1 @@
-Subproject commit cfa4664b3182840ec3f8dac6da8e8562d11468d3
+Subproject commit 13769a7fcba0d6ba67519b78e590019573776993
diff --git a/src/app/vault/add-edit.component.html b/src/app/vault/add-edit.component.html
index 4667513b53..cdcb0e4b84 100644
--- a/src/app/vault/add-edit.component.html
+++ b/src/app/vault/add-edit.component.html
@@ -367,17 +367,16 @@
                     </div>
                 </div>
                 <ng-container *ngIf="editMode">
-                    <h3 class="mt-4">{{'other' | i18n}}</h3>
-                    <div class="small text-muted">
+                    <div class="small text-muted mt-4">
                         <div>
                             <b class="font-weight-semibold">{{'dateUpdated' | i18n}}:</b>
                             {{cipher.revisionDate | date:'medium'}}
                         </div>
-                        <div *ngIf="passwordRevisionDate">
+                        <div *ngIf="showRevisionDate">
                             <b class="font-weight-semibold">{{'datePasswordUpdated' | i18n}}:</b>
-                            {{passwordRevisionDate | date:'medium'}}
+                            {{cipher.passwordRevisionDisplayDate | date:'medium'}}
                         </div>
-                        <div *ngIf="cipher.hasPasswordHistory">
+                        <div *ngIf="hasPasswordHistory">
                             <b class="font-weight-semibold">{{'passwordHistory' | i18n}}:</b>
                             <a href="#" appStopClick (click)="viewHistory()" title="{{'view' | i18n}}">
                                 {{cipher.passwordHistory.length}}
diff --git a/src/app/vault/add-edit.component.ts b/src/app/vault/add-edit.component.ts
index 7627beb53f..3e97de7b2f 100644
--- a/src/app/vault/add-edit.component.ts
+++ b/src/app/vault/add-edit.component.ts
@@ -33,7 +33,8 @@ export class AddEditComponent extends BaseAddEditComponent implements OnInit {
     totpDash: number;
     totpSec: number;
     totpLow: boolean;
-    passwordRevisionDate: Date;
+    showRevisionDate = false;
+    hasPasswordHistory = false;
     viewingPasswordHistory = false;
 
     protected totpInterval: number;
@@ -50,7 +51,8 @@ export class AddEditComponent extends BaseAddEditComponent implements OnInit {
 
     async ngOnInit() {
         await super.load();
-        this.passwordRevisionDate = this.cipher.passwordRevisionDisplayDate;
+        this.showRevisionDate = this.cipher.passwordRevisionDisplayDate != null;
+        this.hasPasswordHistory = this.cipher.hasPasswordHistory;
         this.cleanUp();
 
         this.isPremium = this.tokenService.getPremium();