From 31204a50599fdd85e00a5534a90c222ca0830682 Mon Sep 17 00:00:00 2001
From: songwongtp <16089160+songwongtp@users.noreply.github.com>
Date: Tue, 2 Jan 2024 10:24:52 +0700
Subject: [PATCH 1/2] fix: nullable cw2

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c462bb32e..0ea6a0d6f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -62,6 +62,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Bug fixes
 
+- [#708](https://github.com/alleslabs/celatone-frontend/pull/708) nullable cw2 info
 - [#707](https://github.com/alleslabs/celatone-frontend/pull/707) contract info api fetching error and module proposal on viewmore
 
 ## v1.4.0
diff --git a/src/lib/services/contract.ts b/src/lib/services/contract.ts
index a829d52be..f2c0611e2 100644
--- a/src/lib/services/contract.ts
+++ b/src/lib/services/contract.ts
@@ -129,8 +129,8 @@ export const zContract = z
     code_hash: z.string().transform(parseTxHash),
     created_height: z.number(),
     created_timestamp: zUtcDate,
-    cw2_contract: z.string(),
-    cw2_version: z.string(),
+    cw2_contract: z.string().nullable(),
+    cw2_version: z.string().nullable(),
     init_msg: z.string(),
     init_proposal_id: z.number().nullish(),
     init_proposal_title: z.string().nullish(),

From 329502bbc9281eb939ec56c8e14c99ddde68a95c Mon Sep 17 00:00:00 2001
From: songwongtp <16089160+songwongtp@users.noreply.github.com>
Date: Tue, 2 Jan 2024 10:34:08 +0700
Subject: [PATCH 2/2] fix: nullable created

---
 src/lib/services/contract.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/lib/services/contract.ts b/src/lib/services/contract.ts
index f2c0611e2..323bee2b7 100644
--- a/src/lib/services/contract.ts
+++ b/src/lib/services/contract.ts
@@ -27,14 +27,14 @@ const zContractRest = z.object({
   contract_info: z.object({
     code_id: z.string(),
     creator: zAddr,
-    admin: zAddr.optional(),
+    admin: zAddr,
     label: z.string(),
     created: z
       .object({
         block_height: z.string(),
         tx_index: z.string(),
       })
-      .optional(),
+      .nullable(),
     ibc_port_id: z.string(),
     extension: z.string().nullable(),
   }),