From dd1d747b604fe6bcd87a1a7f6507432c6fcf2006 Mon Sep 17 00:00:00 2001
From: Nabarun <nabarun@deepstacksoft.com>
Date: Tue, 24 Jun 2025 17:06:51 +0000
Subject: [PATCH] Implement feature to add custom network config to embedded
 wallet (#59)

Part of https://www.notion.so/Laconic-Mainnet-Plan-1eca6b22d47280569cd0d1e6d711d949

Co-authored-by: Shreerang Kale <shreerangkale@gmail.com>
Co-authored-by: Prathamesh Musale <prathamesh.musale0@gmail.com>
Reviewed-on: https://git.vdb.to/cerc-io/snowballtools-base/pulls/59
Co-authored-by: Nabarun <nabarun@deepstacksoft.com>
Co-committed-by: Nabarun <nabarun@deepstacksoft.com>
---
 .gitea/workflows/deploy-frontend.yaml         |   6 +-
 build-webapp.sh                               |   1 -
 package.json                                  |   5 +-
 packages/deployer/config.yml                  |   6 +-
 packages/deployer/deploy-frontend.sh          |   1 -
 packages/frontend/.env.example                |   1 -
 .../public/android-chrome-192x192.png         | Bin 0 -> 3224 bytes
 packages/frontend/public/network.json         |  11 +++
 .../create/ApproveTransactionModal.tsx        |  30 ++++--
 .../projects/create/CheckBalanceIframe.tsx    |  20 ++--
 .../components/projects/create/Configure.tsx  |   5 +-
 .../project/overview/Activity/AuctionCard.tsx |   5 +
 .../shared/auth/AutoSignInIFrameModal.tsx     |   5 +-
 packages/frontend/src/constants.ts            |  11 +++
 packages/frontend/src/hooks/useAddNetwork.ts  |  92 ++++++++++++++++++
 .../frontend/src/hooks/useCheckBalance.tsx    |  12 ++-
 .../pages/org-slug/projects/id/Overview.tsx   |   2 +-
 packages/frontend/src/utils/constants.ts      |   1 -
 packages/gql-client/src/client.ts             |  15 ++-
 19 files changed, 189 insertions(+), 40 deletions(-)
 create mode 100644 packages/frontend/public/android-chrome-192x192.png
 create mode 100644 packages/frontend/public/network.json
 create mode 100644 packages/frontend/src/hooks/useAddNetwork.ts

diff --git a/.gitea/workflows/deploy-frontend.yaml b/.gitea/workflows/deploy-frontend.yaml
index 1f604639..789fa08e 100644
--- a/.gitea/workflows/deploy-frontend.yaml
+++ b/.gitea/workflows/deploy-frontend.yaml
@@ -47,11 +47,11 @@ jobs:
           cat > packages/deployer/config.yml <<EOF
           services:
             registry:
-              rpcEndpoint: https://laconicd-sapo.laconic.com
-              gqlEndpoint: https://laconicd-sapo.laconic.com/api
+              rpcEndpoint: https://laconicd-mainnet-1.laconic.com
+              gqlEndpoint: https://laconicd-mainnet-1.laconic.com/api
               userKey: $REGISTRY_USER_KEY
               bondId: $REGISTRY_BOND_ID
-              chainId: laconic-testnet-2
+              chainId: laconic-mainnet
               gasPrice: 0.001alnt
           EOF
 
diff --git a/build-webapp.sh b/build-webapp.sh
index 81599b2d..dad4f0c6 100755
--- a/build-webapp.sh
+++ b/build-webapp.sh
@@ -15,7 +15,6 @@ VITE_GITHUB_CLIENT_ID = 'LACONIC_HOSTED_CONFIG_github_clientid'
 VITE_GITHUB_PWA_TEMPLATE_REPO = 'LACONIC_HOSTED_CONFIG_github_pwa_templaterepo'
 VITE_GITHUB_IMAGE_UPLOAD_PWA_TEMPLATE_REPO = 'LACONIC_HOSTED_CONFIG_github_image_upload_templaterepo'
 VITE_GITHUB_NEXT_APP_TEMPLATE_REPO = 'LACONIC_HOSTED_CONFIG_github_next_app_templaterepo'
-VITE_LACONICD_CHAIN_ID = 'LACONIC_HOSTED_CONFIG_laconicd_chain_id'
 VITE_WALLET_IFRAME_URL = 'LACONIC_HOSTED_CONFIG_wallet_iframe_url'
 VITE_LIT_RELAY_API_KEY = 'LACONIC_HOSTED_CONFIG_lit_relay_api_key'
 VITE_BUGSNAG_API_KEY = 'LACONIC_HOSTED_CONFIG_bugsnag_api_key'
diff --git a/package.json b/package.json
index 4942f53a..4451516e 100644
--- a/package.json
+++ b/package.json
@@ -14,5 +14,6 @@
     "prepare": "husky install",
     "build": "lerna run build --stream",
     "lint": "lerna run lint --stream"
-  }
-}
\ No newline at end of file
+  },
+  "packageManager": "yarn@1.22.19+sha1.4ba7fc5c6e704fce2066ecbfb0b0d8976fe62447"
+}
diff --git a/packages/deployer/config.yml b/packages/deployer/config.yml
index 730022eb..26815778 100644
--- a/packages/deployer/config.yml
+++ b/packages/deployer/config.yml
@@ -1,8 +1,8 @@
 services:
   registry:
-    rpcEndpoint: https://laconicd-sapo.laconic.com
-    gqlEndpoint: https://laconicd-sapo.laconic.com/api
+    rpcEndpoint: https://laconicd-mainnet-1.laconic.com
+    gqlEndpoint: https://laconicd-mainnet-1.laconic.com/api
     userKey:
     bondId:
-    chainId: laconic-testnet-2
+    chainId: laconic-mainnet
     gasPrice: 0.001alnt
diff --git a/packages/deployer/deploy-frontend.sh b/packages/deployer/deploy-frontend.sh
index f79f71d5..e31e0575 100755
--- a/packages/deployer/deploy-frontend.sh
+++ b/packages/deployer/deploy-frontend.sh
@@ -133,7 +133,6 @@ record:
       LACONIC_HOSTED_CONFIG_github_pwa_templaterepo: laconic-templates/test-progressive-web-app
       LACONIC_HOSTED_CONFIG_github_image_upload_templaterepo: laconic-templates/image-upload-pwa-example
       LACONIC_HOSTED_CONFIG_github_next_app_templaterepo: laconic-templates/starter.nextjs-react-tailwind
-      LACONIC_HOSTED_CONFIG_laconicd_chain_id: laconic-testnet-2
       LACONIC_HOSTED_CONFIG_wallet_iframe_url: https://wallet.laconic.com
   meta:
     note: Added @ $CURRENT_DATE_TIME
diff --git a/packages/frontend/.env.example b/packages/frontend/.env.example
index b634634b..2fb5aa05 100644
--- a/packages/frontend/.env.example
+++ b/packages/frontend/.env.example
@@ -12,5 +12,4 @@ VITE_BUGSNAG_API_KEY=
 VITE_PASSKEY_WALLET_RPID=
 VITE_TURNKEY_API_BASE_URL=
 
-VITE_LACONICD_CHAIN_ID=
 VITE_WALLET_IFRAME_URL=
diff --git a/packages/frontend/public/android-chrome-192x192.png b/packages/frontend/public/android-chrome-192x192.png
new file mode 100644
index 0000000000000000000000000000000000000000..25a861158252d131639f2fe17d1cef51e9876954
GIT binary patch
literal 3224
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
IC*7(41DmC{2LJ#7

literal 0
HcmV?d00001

diff --git a/packages/frontend/public/network.json b/packages/frontend/public/network.json
new file mode 100644
index 00000000..90189396
--- /dev/null
+++ b/packages/frontend/public/network.json
@@ -0,0 +1,11 @@
+{
+  "chainId": "laconic-mainnet",
+  "networkName": "laconicd mainnet",
+  "namespace": "cosmos",
+  "rpcUrl": "https://laconicd-mainnet-1.laconic.com",
+  "blockExplorerUrl": "",
+  "nativeDenom": "alnt",
+  "addressPrefix": "laconic",
+  "coinType": 118,
+  "gasPrice": 0.001
+}
diff --git a/packages/frontend/src/components/projects/create/ApproveTransactionModal.tsx b/packages/frontend/src/components/projects/create/ApproveTransactionModal.tsx
index 25a86fdf..52adc443 100644
--- a/packages/frontend/src/components/projects/create/ApproveTransactionModal.tsx
+++ b/packages/frontend/src/components/projects/create/ApproveTransactionModal.tsx
@@ -3,9 +3,10 @@ import { useCallback, useEffect } from 'react';
 import { Box, Modal } from '@mui/material';
 
 import {
-  VITE_LACONICD_CHAIN_ID,
   VITE_WALLET_IFRAME_URL,
 } from 'utils/constants';
+import { REQUEST_WALLET_ACCOUNTS, WALLET_ACCOUNTS_DATA } from '../../../constants';
+import { useAddNetwork } from '../../../hooks/useAddNetwork';
 
 const ApproveTransactionModal = ({
   setAccount,
@@ -16,15 +17,17 @@ const ApproveTransactionModal = ({
   setIsDataReceived: (isReceived: boolean) => void;
   isVisible: boolean;
 }) => {
+  const { setIframe, isNetworkAvailable, networkData } = useAddNetwork();
+
   useEffect(() => {
     const handleMessage = (event: MessageEvent) => {
       if (event.origin !== VITE_WALLET_IFRAME_URL) return;
 
-      if (event.data.type === 'WALLET_ACCOUNTS_DATA') {
+      if (event.data.type === WALLET_ACCOUNTS_DATA) {
         setIsDataReceived(true);
 
         if (event.data.data.length === 0) {
-          console.error(`Accounts not present for chainId: ${VITE_LACONICD_CHAIN_ID}`);
+          console.error(`Accounts not present for chainId: ${networkData?.chainId}`);
           return;
         }
 
@@ -41,9 +44,14 @@ const ApproveTransactionModal = ({
     return () => {
       window.removeEventListener('message', handleMessage);
     };
-  }, []);
+  }, [networkData]);
 
   const getDataFromWallet = useCallback(() => {
+    if (!networkData) {
+      console.error('networkData should not be empty');
+      return;
+    }
+
     const iframe = document.getElementById('walletIframe') as HTMLIFrameElement;
 
     if (!iframe.contentWindow) {
@@ -53,12 +61,18 @@ const ApproveTransactionModal = ({
 
     iframe.contentWindow.postMessage(
       {
-        type: 'REQUEST_WALLET_ACCOUNTS',
-        chainId: VITE_LACONICD_CHAIN_ID,
+        type: REQUEST_WALLET_ACCOUNTS,
+        chainId: networkData.chainId,
       },
       VITE_WALLET_IFRAME_URL,
     );
-  }, []);
+  }, [networkData]);
+
+  useEffect(() => {
+    if (isNetworkAvailable) {
+      getDataFromWallet();
+    }
+  }, [isNetworkAvailable, getDataFromWallet])
 
   return (
     <Modal open={isVisible} disableEscapeKeyDown keepMounted>
@@ -80,7 +94,7 @@ const ApproveTransactionModal = ({
         }}
       >
         <iframe
-          onLoad={getDataFromWallet}
+          onLoad={(event) => setIframe(event.target as HTMLIFrameElement)}
           id="walletIframe"
           src={`${VITE_WALLET_IFRAME_URL}/wallet-embed`}
           width="100%"
diff --git a/packages/frontend/src/components/projects/create/CheckBalanceIframe.tsx b/packages/frontend/src/components/projects/create/CheckBalanceIframe.tsx
index c04941cf..9be1a4fc 100644
--- a/packages/frontend/src/components/projects/create/CheckBalanceIframe.tsx
+++ b/packages/frontend/src/components/projects/create/CheckBalanceIframe.tsx
@@ -1,9 +1,10 @@
-import { useEffect, useState } from 'react';
+import { useEffect } from 'react';
 
 import { Modal } from '@mui/material';
 
 import { VITE_WALLET_IFRAME_URL } from 'utils/constants';
 import useCheckBalance from '../../../hooks/useCheckBalance';
+import { useAddNetwork } from '../../../hooks/useAddNetwork';
 
 const CHECK_BALANCE_INTERVAL = 5000;
 const IFRAME_ID = 'checkBalanceIframe';
@@ -22,20 +23,19 @@ const CheckBalanceIframe = ({
     IFRAME_ID,
   );
 
-  const [isLoaded, setIsLoaded] = useState(false);
-
+  const { isNetworkAvailable, setIframe } = useAddNetwork();
+  
   useEffect(() => {
-    if (!isLoaded) {
+    if (!isNetworkAvailable || isBalanceSufficient) {
       return;
     }
+
     checkBalance();
-  }, [amount, checkBalance, isLoaded]);
 
-  useEffect(() => {
-    if (!isPollingEnabled || !isLoaded || isBalanceSufficient) {
+    if (!isPollingEnabled) {
       return;
     }
-
+    
     const interval = setInterval(() => {
       checkBalance();
     }, CHECK_BALANCE_INTERVAL);
@@ -43,7 +43,7 @@ const CheckBalanceIframe = ({
     return () => {
       clearInterval(interval);
     };
-  }, [isBalanceSufficient, isPollingEnabled, checkBalance, isLoaded]);
+  }, [isBalanceSufficient, isPollingEnabled, checkBalance, isNetworkAvailable]);
 
   useEffect(() => {
     onBalanceChange(isBalanceSufficient);
@@ -52,7 +52,7 @@ const CheckBalanceIframe = ({
   return (
     <Modal open={false} disableEscapeKeyDown keepMounted>
       <iframe
-        onLoad={() => setIsLoaded(true)}
+        onLoad={(event) => setIframe(event.target as HTMLIFrameElement)}
         id={IFRAME_ID}
         src={VITE_WALLET_IFRAME_URL}
         width="100%"
diff --git a/packages/frontend/src/components/projects/create/Configure.tsx b/packages/frontend/src/components/projects/create/Configure.tsx
index 4c421efb..7e6c9624 100644
--- a/packages/frontend/src/components/projects/create/Configure.tsx
+++ b/packages/frontend/src/components/projects/create/Configure.tsx
@@ -25,10 +25,10 @@ import ApproveTransactionModal from './ApproveTransactionModal';
 import EnvironmentVariablesForm from 'pages/org-slug/projects/id/settings/EnvironmentVariablesForm';
 import { EnvironmentVariablesFormValues } from 'types/types';
 import {
-  VITE_LACONICD_CHAIN_ID,
   VITE_WALLET_IFRAME_URL,
 } from 'utils/constants';
 import CheckBalanceIframe from './CheckBalanceIframe';
+import { useAddNetwork } from '../../../hooks/useAddNetwork';
 
 type ConfigureDeploymentFormValues = {
   option: string;
@@ -71,6 +71,7 @@ const Configure = () => {
   const navigate = useNavigate();
   const { toast, dismiss } = useToast();
   const client = useGQLClient();
+  const { networkData } = useAddNetwork()
 
   const methods = useForm<ConfigureFormValues>({
     defaultValues: {
@@ -421,7 +422,7 @@ const Configure = () => {
     iframe.contentWindow.postMessage(
       {
         type: 'REQUEST_TX',
-        chainId: VITE_LACONICD_CHAIN_ID,
+        chainId: networkData?.chainId,
         fromAddress: sender,
         toAddress: recipient,
         amount,
diff --git a/packages/frontend/src/components/projects/project/overview/Activity/AuctionCard.tsx b/packages/frontend/src/components/projects/project/overview/Activity/AuctionCard.tsx
index 9dd11859..2cb8a701 100644
--- a/packages/frontend/src/components/projects/project/overview/Activity/AuctionCard.tsx
+++ b/packages/frontend/src/components/projects/project/overview/Activity/AuctionCard.tsx
@@ -43,6 +43,11 @@ export const AuctionCard = ({ project }: { project: Project }) => {
 
   const checkAuctionStatus = useCallback(async () => {
     const result = await client.getAuctionData(project.auctionId);
+
+    if (!result) {
+      return
+    }
+
     setAuctionStatus(result.status);
     setAuctionDetails(result);
   }, [project.auctionId, project.deployers, project.fundsReleased]);
diff --git a/packages/frontend/src/components/shared/auth/AutoSignInIFrameModal.tsx b/packages/frontend/src/components/shared/auth/AutoSignInIFrameModal.tsx
index ab87bda3..ee0947e2 100644
--- a/packages/frontend/src/components/shared/auth/AutoSignInIFrameModal.tsx
+++ b/packages/frontend/src/components/shared/auth/AutoSignInIFrameModal.tsx
@@ -6,6 +6,7 @@ import { useNavigate } from 'react-router-dom';
 import { Box, Modal } from '@mui/material';
 
 import { BASE_URL, VITE_WALLET_IFRAME_URL } from 'utils/constants';
+import { REQUEST_CREATE_OR_GET_ACCOUNTS, WALLET_ACCOUNTS_DATA } from '../../../constants';
 
 const axiosInstance = axios.create({
   baseURL: BASE_URL,
@@ -91,7 +92,7 @@ const AutoSignInIFrameModal = () => {
     const handleAccountsDataResponse = async (event: MessageEvent) => {
       if (event.origin !== VITE_WALLET_IFRAME_URL) return;
 
-      if (event.data.type === 'WALLET_ACCOUNTS_DATA') {
+      if (event.data.type === WALLET_ACCOUNTS_DATA) {
         setAccountAddress(event.data.data[0]);
       }
     };
@@ -115,7 +116,7 @@ const AutoSignInIFrameModal = () => {
 
     iframe.contentWindow.postMessage(
       {
-        type: 'REQUEST_CREATE_OR_GET_ACCOUNTS',
+        type: REQUEST_CREATE_OR_GET_ACCOUNTS,
         chainId: '1',
       },
       VITE_WALLET_IFRAME_URL,
diff --git a/packages/frontend/src/constants.ts b/packages/frontend/src/constants.ts
index 77bd7435..d897bf7f 100644
--- a/packages/frontend/src/constants.ts
+++ b/packages/frontend/src/constants.ts
@@ -3,3 +3,14 @@ export const SHORT_COMMIT_HASH_LENGTH = 8;
 export const SERVER_GQL_PATH = 'graphql';
 
 export const SHOPIFY_APP_URL = 'https://store.laconic.com';
+
+// iframe request types
+export const REQUEST_CREATE_OR_GET_ACCOUNTS = 'REQUEST_CREATE_OR_GET_ACCOUNTS';
+export const REQUEST_ADD_NETWORK = 'REQUEST_ADD_NETWORK';
+export const REQUEST_WALLET_ACCOUNTS = 'REQUEST_WALLET_ACCOUNTS';
+
+// iframe response types
+export const WALLET_ACCOUNTS_DATA = 'WALLET_ACCOUNTS_DATA';
+export const NETWORK_ADDED_RESPONSE = "NETWORK_ADDED_RESPONSE";
+export const NETWORK_ALREADY_EXISTS_RESPONSE = "NETWORK_ALREADY_EXISTS_RESPONSE";
+export const NETWORK_ADD_FAILED_RESPONSE = "NETWORK_ADD_FAILED_RESPONSE";
diff --git a/packages/frontend/src/hooks/useAddNetwork.ts b/packages/frontend/src/hooks/useAddNetwork.ts
new file mode 100644
index 00000000..39e8d708
--- /dev/null
+++ b/packages/frontend/src/hooks/useAddNetwork.ts
@@ -0,0 +1,92 @@
+import { useState, useEffect } from 'react';
+import { VITE_WALLET_IFRAME_URL } from 'utils/constants';
+import { NETWORK_ADD_FAILED_RESPONSE, NETWORK_ADDED_RESPONSE, NETWORK_ALREADY_EXISTS_RESPONSE, REQUEST_ADD_NETWORK } from '../constants';
+
+interface NetworkData {
+  chainId: string;
+  namespace: string;
+  networkName: string;
+  rpcUrl: string;
+  coinType: string;
+  addressPrefix?: string;
+  blockExplorerUrl?: string;
+  nativeDenom?: string;
+  gasPrice?: string;
+}
+
+export const useAddNetwork = () => {
+  const [networkData, setNetworkData] = useState<NetworkData | null>(null);
+  const [iframe, setIframe] = useState<HTMLIFrameElement | null>(null);
+  const [isNetworkAvailable, setIsNetworkAvailable] = useState(false);
+
+  // useEffect to add network in embedded wallet
+  useEffect(() => {
+    if (!networkData) {
+      return;
+    }
+
+    if (!iframe?.contentWindow) {
+      return;
+    }
+
+    iframe.contentWindow.postMessage(
+      {
+        type: REQUEST_ADD_NETWORK,
+        chainId: networkData.chainId,
+        networkData,
+      },
+      VITE_WALLET_IFRAME_URL,
+    );
+  }, [networkData, iframe]);
+
+  // useEffect to listen for network add reponses
+  useEffect(() => {
+    const handleMessage = (event: MessageEvent) => {
+      if (event.origin !== VITE_WALLET_IFRAME_URL) return;
+
+      switch (event.data.type) {
+        case NETWORK_ADDED_RESPONSE:
+        case NETWORK_ALREADY_EXISTS_RESPONSE:
+          // Once network is available, set state
+          setIsNetworkAvailable(true);
+          break;
+
+        case NETWORK_ADD_FAILED_RESPONSE:
+          setIsNetworkAvailable(false);
+          console.error("Network could not be added:", event.data.message);
+          break;
+
+        default:
+          break;
+      }
+    };
+
+    window.addEventListener('message', handleMessage);
+
+    return () => {
+      window.removeEventListener('message', handleMessage);
+    };
+  }, []);
+
+  useEffect(() => {
+    const loadNetworkData = async () => {
+      try {
+        const res = await fetch('/network.json');
+        const json = await res.json();
+
+        setNetworkData(json);
+      } catch (err) {
+        console.error('Failed to load network data:', err);
+      }
+    };
+
+    loadNetworkData();
+  }, []);
+
+  return {
+    networkData,
+    isNetworkAvailable,
+    iframe,
+    setIframe
+  };
+};
diff --git a/packages/frontend/src/hooks/useCheckBalance.tsx b/packages/frontend/src/hooks/useCheckBalance.tsx
index be5ee33c..3b1bcdd3 100644
--- a/packages/frontend/src/hooks/useCheckBalance.tsx
+++ b/packages/frontend/src/hooks/useCheckBalance.tsx
@@ -1,11 +1,17 @@
 import { useState, useEffect, useCallback } from 'react';
 
-import { VITE_LACONICD_CHAIN_ID } from 'utils/constants';
+import { useAddNetwork } from './useAddNetwork';
 
 const useCheckBalance = (amount: string, iframeId: string) => {
   const [isBalanceSufficient, setIsBalanceSufficient] = useState<boolean>();
 
+  const { networkData } = useAddNetwork()
+
   const checkBalance = useCallback(() => {
+    if (!networkData) {
+      return;
+    }
+
     const iframe = document.getElementById(iframeId) as HTMLIFrameElement;
 
     if (!iframe || !iframe.contentWindow) {
@@ -16,12 +22,12 @@ const useCheckBalance = (amount: string, iframeId: string) => {
     iframe.contentWindow.postMessage(
       {
         type: 'CHECK_BALANCE',
-        chainId: VITE_LACONICD_CHAIN_ID,
+        chainId: networkData.chainId,
         amount,
       },
       import.meta.env.VITE_WALLET_IFRAME_URL
     );
-  }, [iframeId, amount]);
+  }, [iframeId, amount, networkData]);
 
   useEffect(() => {
     const handleMessage = (event: MessageEvent) => {
diff --git a/packages/frontend/src/pages/org-slug/projects/id/Overview.tsx b/packages/frontend/src/pages/org-slug/projects/id/Overview.tsx
index 52618aa8..ffb0eea1 100644
--- a/packages/frontend/src/pages/org-slug/projects/id/Overview.tsx
+++ b/packages/frontend/src/pages/org-slug/projects/id/Overview.tsx
@@ -204,7 +204,7 @@ const OverviewTabPanel = () => {
               {project.deployments &&
                 project.deployments.length > 0 &&
                 project.deployments.map((deployment) => (
-                  <div className="flex gap-2 items-center">
+                  <div key={deployment.id} className="flex gap-2 items-center">
                     <Link to={deployment.applicationDeploymentRecordData.url}>
                       <span className="text-controls-primary dark:text-foreground group hover:border-controls-primary transition-colors border-b border-b-transparent flex gap-2 items-center text-sm tracking-tight">
                         {deployment.applicationDeploymentRecordData.url}
diff --git a/packages/frontend/src/utils/constants.ts b/packages/frontend/src/utils/constants.ts
index f9135880..728624be 100644
--- a/packages/frontend/src/utils/constants.ts
+++ b/packages/frontend/src/utils/constants.ts
@@ -10,5 +10,4 @@ export const VITE_GITHUB_NEXT_APP_TEMPLATE_REPO = import.meta.env
 export const VITE_GITHUB_CLIENT_ID = import.meta.env.VITE_GITHUB_CLIENT_ID;
 export const VITE_BUGSNAG_API_KEY = import.meta.env.VITE_BUGSNAG_API_KEY;
 export const VITE_LIT_RELAY_API_KEY = import.meta.env.VITE_LIT_RELAY_API_KEY;
-export const VITE_LACONICD_CHAIN_ID = import.meta.env.VITE_LACONICD_CHAIN_ID;
 export const VITE_WALLET_IFRAME_URL = import.meta.env.VITE_WALLET_IFRAME_URL;
diff --git a/packages/gql-client/src/client.ts b/packages/gql-client/src/client.ts
index 49ddbb60..81ae2ac5 100644
--- a/packages/gql-client/src/client.ts
+++ b/packages/gql-client/src/client.ts
@@ -414,14 +414,25 @@ export class GQLClient {
     return data;
   }
 
-  async getAuctionData(auctionId: string): Promise<types.Auction> {
-    const { data } = await this.client.query({
+  async getAuctionData(auctionId: string): Promise<types.Auction | null> {
+    const { data, errors } = await this.client.query({
       query: queries.getAuctionData,
       variables: {
         auctionId,
       },
     });
 
+
+    if (errors && errors.length) {
+      const isAuctionNotFound = errors.some((error) =>
+        error.message?.includes('Auction not found')
+      );
+
+      if (isAuctionNotFound) {
+        return data;
+      }
+    }
+
     return data.getAuctionData;
   }