Remove calls to 0.rpc on deploy page

thirdweb-dev · Oct 4, 2024 · 6175d6f · 6175d6f
1 parent 04f8269
commit 6175d6f
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/apps/dashboard/src/components/contract-components/contract-deploy-form/custom-contract.tsx b/apps/dashboard/src/components/contract-components/contract-deploy-form/custom-contract.tsx
@@ -145,7 +145,7 @@ export const CustomContractForm: React.FC<CustomContractFormProps> = ({
 
   const customFactoryAbi = useCustomFactoryAbi(
     customFactoryAddress,
-    Number(customFactoryNetwork),
+    customFactoryNetwork ? Number(customFactoryNetwork) : undefined,
   );
 
   const isTWPublisher = checkTwPublisher(metadata?.publisher);

diff --git a/apps/dashboard/src/components/contract-components/hooks.ts b/apps/dashboard/src/components/contract-components/hooks.ts
@@ -212,19 +212,32 @@ export function useContractEvents(abi: Abi) {
   return abi.filter((a) => a.type === "event");
 }
 
-export function useCustomFactoryAbi(contractAddress: string, chainId: number) {
+export function useCustomFactoryAbi(
+  contractAddress: string,
+  chainId: number | undefined,
+) {
   const chain = useV5DashboardChain(chainId);
   const client = useThirdwebClient();
   const contract = useMemo(() => {
+    if (!chain) {
+      return undefined;
+    }
+
     return getContract({
       client,
       address: contractAddress,
       chain,
     });
   }, [contractAddress, chain, client]);
+
   return useQuery({
     queryKey: ["custom-factory-abi", contract],
-    queryFn: () => resolveContractAbi<Abi>(contract),
+    queryFn: () => {
+      if (!contract) {
+        throw new Error("Contract not found");
+      }
+      return resolveContractAbi<Abi>(contract);
+    },
     enabled: !!contract,
   });
 }