From cc9b7d3edf77f523433f6a8cda5577e56ae1a4e2 Mon Sep 17 00:00:00 2001
From: Dev Sharma <devsharma.3624@gmail.com>
Date: Fri, 12 Jun 2026 20:49:13 +0530
Subject: [PATCH] [PM-38918] fix: PM-38644, UI/UX inconsistency: Passport
 number in Identity items is not a hidden field (#7053)

---
 .../feature/item/VaultItemIdentityContent.kt   | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemIdentityContent.kt b/app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemIdentityContent.kt
index fac104ef79..1cd030bd4a 100644
--- a/app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemIdentityContent.kt
+++ b/app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemIdentityContent.kt
@@ -163,13 +163,21 @@ fun VaultItemIdentityContent(
         }
         identityState.passportNumber?.let { passportNumber ->
             item(key = "passportNumber") {
-                IdentityCopyField(
+                BitwardenPasswordField(
                     label = stringResource(id = BitwardenString.passport_number),
                     value = passportNumber,
-                    copyContentDescription = stringResource(id = BitwardenString.copy_passport_number),
-                    textFieldTestTag = "IdentityPassportNumberEntry",
-                    copyActionTestTag = "IdentityCopyPassportNumberButton",
-                    onCopyClick = vaultIdentityItemTypeHandlers.onCopyPassportNumberClick,
+                    onValueChange = {},
+                    readOnly = true,
+                    actions = {
+                        BitwardenStandardIconButton(
+                            vectorIconRes = BitwardenDrawable.ic_copy,
+                            contentDescription = stringResource(id = BitwardenString.copy_passport_number),
+                            onClick = vaultIdentityItemTypeHandlers.onCopyPassportNumberClick,
+                            modifier = Modifier.testTag(tag = "IdentityCopyPassportNumberButton"),
+                        )
+                    },
+                    passwordFieldTestTag = "IdentityPassportNumberEntry",
+                    showPasswordTestTag = "IdentityViewPassportNumberButton",
                     cardStyle = identityState
                         .propertyList
                         .toListItemCardStyle(