From 6eb6ff9ce7e9536ffbcfd11b87e3b7c5d0798e8c Mon Sep 17 00:00:00 2001
From: songwongtp <16089160+songwongtp@users.noreply.github.com>
Date: Thu, 18 Jan 2024 18:07:30 +0700
Subject: [PATCH] fix: contract lists nullable fields

---
 CHANGELOG.md                 |  1 +
 src/lib/services/contract.ts | 11 ++++++-----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index abb3c8dd0..28cedac1d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -60,6 +60,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Bug fixes
 
+- [#733](https://github.com/alleslabs/celatone-frontend/pull/733) Fix contract list nullable fields
 - [#722](https://github.com/alleslabs/celatone-frontend/pull/722) Fix flicker query page
 
 ## v1.4.1
diff --git a/src/lib/services/contract.ts b/src/lib/services/contract.ts
index 39811e9e0..61ffb8183 100644
--- a/src/lib/services/contract.ts
+++ b/src/lib/services/contract.ts
@@ -66,17 +66,18 @@ const zContractsResponseItem = z
     contract_address: zBechAddr32,
     label: z.string(),
     admin: zBechAddr.nullable(),
-    instantiator: zBechAddr,
-    latest_updated: zUtcDate,
+    instantiator: zBechAddr.nullable(),
+    latest_updated: zUtcDate.nullable(),
     latest_updater: zBechAddr.optional(),
     remark: zContractHistoryRemark.optional(),
   })
   .transform<ContractInfo>((val) => ({
     contractAddress: val.contract_address,
     label: val.label,
-    admin: val.admin ? val.admin : undefined,
-    instantiator: val.instantiator,
-    latestUpdated: val.latest_updated,
+    // TODO: change contract info optional fields to nullable fields
+    admin: val.admin ?? undefined,
+    instantiator: val.instantiator ?? undefined,
+    latestUpdated: val.latest_updated ?? undefined,
     latestUpdater: val.latest_updater,
     remark: val.remark,
   }));