From dbb341141a721299637ec3ffaf37ec909d584f2a Mon Sep 17 00:00:00 2001
From: Jordan Aasen <166539328+jaasen-livefront@users.noreply.github.com>
Date: Fri, 17 Jan 2025 09:10:28 -0800
Subject: [PATCH] [PM-15572] - don't allow restore for 'edit except password'
 permission (#12851)

* don't allow restore for 'edit except password' permission

* show login credentials if only passkey is present

* Revert "show login credentials if only passkey is present"

This reverts commit dc2f2367c2092cb827cf95fe8c7bc82919949627.
---
 .../popup/components/vault-v2/view-v2/view-v2.component.ts  | 6 +++++-
 .../trash-list-items-container.component.html               | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/apps/browser/src/vault/popup/components/vault-v2/view-v2/view-v2.component.ts b/apps/browser/src/vault/popup/components/vault-v2/view-v2/view-v2.component.ts
index 6532fb004cb..f3cd713dd5f 100644
--- a/apps/browser/src/vault/popup/components/vault-v2/view-v2/view-v2.component.ts
+++ b/apps/browser/src/vault/popup/components/vault-v2/view-v2/view-v2.component.ts
@@ -235,7 +235,11 @@ export class ViewV2Component {
   }
 
   protected showFooter(): boolean {
-    return this.cipher && (!this.cipher.isDeleted || (this.cipher.isDeleted && this.cipher.edit));
+    return (
+      this.cipher &&
+      (!this.cipher.isDeleted ||
+        (this.cipher.isDeleted && this.cipher.edit && this.cipher.viewPassword))
+    );
   }
 
   /**
diff --git a/apps/browser/src/vault/popup/settings/trash-list-items-container/trash-list-items-container.component.html b/apps/browser/src/vault/popup/settings/trash-list-items-container/trash-list-items-container.component.html
index dcbda9fd96a..c77ac4f9755 100644
--- a/apps/browser/src/vault/popup/settings/trash-list-items-container/trash-list-items-container.component.html
+++ b/apps/browser/src/vault/popup/settings/trash-list-items-container/trash-list-items-container.component.html
@@ -31,7 +31,7 @@
         ></i>
         <span slot="secondary">{{ cipher.subTitle }}</span>
       </button>
-      <ng-container slot="end" *ngIf="cipher.edit">
+      <ng-container slot="end" *ngIf="cipher.edit && cipher.viewPassword">
         <bit-item-action>
           <button
             type="button"