Merge branch 'main' into wallets-overview

Author: saminacodes

apps/dashboard/src/app/(app)/(dashboard)/(chain)/[chain_id]/[contractAddress]/public-pages/_components/getContractCreator.tsx

@@ -9,19 +9,23 @@ export async function getContractCreator(
   contract: ThirdwebContract,
   functionSelectors: string[],
 ) {
-  if (isOwnerSupported(functionSelectors)) {
-    return owner({
-      contract,
-    });
-  }
+  try {
+    if (isOwnerSupported(functionSelectors)) {
+      return await owner({
+        contract,
+      });
+    }
 
-  if (isGetRoleAdminSupported(functionSelectors)) {
-    return getRoleMember({
-      contract,
-      index: BigInt(0),
-      role: "admin",
-    });
-  }
+    if (isGetRoleAdminSupported(functionSelectors)) {
+      return await getRoleMember({
+        contract,
+        index: BigInt(0),
+        role: "admin",
+      });
+    }
 
-  return null;
+    return null;
+  } catch {
+    return null;
+  }
 }

apps/dashboard/src/app/(app)/team/[team_slug]/(team)/~/ecosystem/[slug]/(active)/configuration/components/client/auth-options-form.client.tsx

@@ -231,22 +231,24 @@ export function AuthOptionsForm({
     }
 
     let smartAccountOptions: Ecosystem["smartAccountOptions"] | null = null;
-    if (data.useSmartAccount && data.executionMode === "EIP4337") {
-      let accountFactoryAddress: string;
-      switch (data.accountFactoryType) {
-        case "v0.6":
-          accountFactoryAddress = DEFAULT_ACCOUNT_FACTORY_V0_6;
-          break;
-        case "v0.7":
-          accountFactoryAddress = DEFAULT_ACCOUNT_FACTORY_V0_7;
-          break;
-        case "custom":
-          if (!data.customAccountFactoryAddress) {
-            toast.error("Please enter a custom account factory address");
-            return;
-          }
-          accountFactoryAddress = data.customAccountFactoryAddress;
-          break;
+    if (data.useSmartAccount) {
+      let accountFactoryAddress: string | undefined;
+      if (data.executionMode === "EIP4337") {
+        switch (data.accountFactoryType) {
+          case "v0.6":
+            accountFactoryAddress = DEFAULT_ACCOUNT_FACTORY_V0_6;
+            break;
+          case "v0.7":
+            accountFactoryAddress = DEFAULT_ACCOUNT_FACTORY_V0_7;
+            break;
+          case "custom":
+            if (!data.customAccountFactoryAddress) {
+              toast.error("Please enter a custom account factory address");
+              return;
+            }
+            accountFactoryAddress = data.customAccountFactoryAddress;
+            break;
+        }
       }
 
       smartAccountOptions = {