Enhance smart account factory address validation in auth options form

Co-authored-by: joaquim.verges <[email protected]>

Author: cursoragent

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

@@ -90,9 +90,9 @@ export function AuthOptionsForm({
         DEFAULT_ACCOUNT_FACTORY_V0_7
           ? "v0.7"
           : ecosystem.smartAccountOptions?.accountFactoryAddress ===
-              DEFAULT_ACCOUNT_FACTORY_V0_6
-            ? "v0.6"
-            : "custom",
+            DEFAULT_ACCOUNT_FACTORY_V0_6
+          ? "v0.6"
+          : "custom",
       authOptions: ecosystem.authOptions || [],
       customAccountFactoryAddress:
         ecosystem.smartAccountOptions?.accountFactoryAddress || "",
@@ -133,6 +133,8 @@ export function AuthOptionsForm({
           (data) => {
             if (
               data.useSmartAccount &&
+              data.executionMode === "EIP4337" &&
+              data.accountFactoryType === "custom" &&
               data.customAccountFactoryAddress &&
               !isAddress(data.customAccountFactoryAddress)
             ) {
@@ -145,6 +147,23 @@ export function AuthOptionsForm({
             path: ["customAccountFactoryAddress"],
           },
         )
+        .refine(
+          (data) => {
+            if (
+              data.useSmartAccount &&
+              data.executionMode === "EIP4337" &&
+              data.accountFactoryType === "custom" &&
+              !data.customAccountFactoryAddress
+            ) {
+              return false;
+            }
+            return true;
+          },
+          {
+            message: "Please enter a custom account factory address",
+            path: ["customAccountFactoryAddress"],
+          },
+        )
         .refine(
           (data) => {
             if (data.useSmartAccount && (data.defaultChainId ?? 0) <= 0) {