From b444c0f4b84762f493f5c9ffa335d3efcd039a5d Mon Sep 17 00:00:00 2001
From: Wankko Ree <wkr@wkr.moe>
Date: Tue, 9 Jun 2026 11:31:36 +0800
Subject: [PATCH] fix: use decrypted password histories when duplicate handling

---
 webapp/src/components/vault/vault-page-helpers.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapp/src/components/vault/vault-page-helpers.tsx b/webapp/src/components/vault/vault-page-helpers.tsx
index 20fa79c..301895d 100644
--- a/webapp/src/components/vault/vault-page-helpers.tsx
+++ b/webapp/src/components/vault/vault-page-helpers.tsx
@@ -326,7 +326,7 @@ export function buildCipherDuplicateSignature(cipher: Cipher): string {
       linkedId: field.linkedId ?? null,
     })),
     passwordHistory: (cipher.passwordHistory || []).map((entry) => ({
-      password: valueOrFallback(entry.password),
+      password: valueOrFallback(entry.decPassword ?? entry.password),
       lastUsedDate: valueOrFallback(entry.lastUsedDate),
     })),
   };