From a290ae7767d8f37e580931d207979b630038281d Mon Sep 17 00:00:00 2001
From: Scott Wilson <scottraywilson@gmail.com>
Date: Mon, 21 Jul 2025 12:31:37 -0700
Subject: [PATCH] fix: correct resource key/value change display

---
 .../components/CommitForm/CommitForm.tsx                    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/frontend/src/pages/secret-manager/SecretDashboardPage/components/CommitForm/CommitForm.tsx b/frontend/src/pages/secret-manager/SecretDashboardPage/components/CommitForm/CommitForm.tsx
index 95d8b396e..fc706218f 100644
--- a/frontend/src/pages/secret-manager/SecretDashboardPage/components/CommitForm/CommitForm.tsx
+++ b/frontend/src/pages/secret-manager/SecretDashboardPage/components/CommitForm/CommitForm.tsx
@@ -97,7 +97,7 @@ const RenderSecretChanges = ({ onDiscard, change }: RenderResourceProps) => {
             {
               version: 1, // placeholder, not used
               secretKey: change.newSecretName ? existingSecret.key : undefined,
-              secretValue: change.secretValue ? existingSecret.value : "",
+              secretValue: change.secretValue ? (existingSecret.value ?? "") : undefined,
               tags: change.tags ? (existingSecret.tags?.map((tag) => tag.slug) ?? []) : undefined,
               secretMetadata: change.secretMetadata ? existingSecret.secretMetadata : undefined,
               skipMultilineEncoding:
@@ -189,12 +189,12 @@ const RenderFolderChanges = ({ onDiscard, change }: RenderResourceProps) => {
           versions: [
             {
               version: 1, // placeholder, not used
-              name: change.folderName ?? change.originalFolderName,
+              name: change.folderName ? change.originalFolderName : undefined,
               description: change.description ? change.originalDescription : undefined
             },
             {
               version: 2, // placeholder, not used
-              name: change.folderName ?? change.originalFolderName,
+              name: change.folderName,
               description: change.description
             }
           ]