refactor: simplify garden joining logic and remove DevConnect references

- Updated Login and ProfileAccount components to remove DevConnect-related logic, streamlining the user experience.
- Refactored useAutoJoinRootGarden hook to eliminate unnecessary checks for DevConnect membership.
- Adjusted deployment scripts and contract configurations to support open joining based on garden settings rather than token ID.
- Enhanced error handling and user feedback in garden joining processes, ensuring clearer communication of membership status.

Author: Oba-One

package.json

@@ -80,7 +80,7 @@
       "npx @biomejs/biome format --write"
     ],
     "*.sol": [
-      "npx forge fmt"
+      "forge fmt"
     ]
   },
   "workspaces": [

packages/client/src/views/Login/index.tsx

@@ -16,15 +16,7 @@ export function Login() {
   const [loadingMessage, setLoadingMessage] = useState<string | undefined>(undefined);
   const [loginError, setLoginError] = useState<string | null>(null);
 
-  // Check if DevConnect is enabled via environment variable
-  const isDevConnectEnabled = import.meta.env.VITE_DEVCONNECT === "true";
-
-  const {
-    joinGarden,
-    isLoading: isJoiningGarden,
-    isGardener: _isGardener,
-    devConnect,
-  } = useAutoJoinRootGarden();
+  const { joinGarden, isLoading: isJoiningGarden } = useAutoJoinRootGarden();
 
   // Check if we're on a nested route (like /login/recover)
   const isNestedRoute = location.pathname !== "/login";
@@ -100,25 +92,6 @@ export function Login() {
           localStorage.setItem(onboardingKey, "true");
         }
       }
-
-      // 2. DevConnect Join (New)
-      if (isDevConnectEnabled && devConnect.isEnabled && !devConnect.isMember) {
-        // Check local storage to avoid re-prompting if they skipped or are pending
-        const dcKey = `greengoods_devconnect_onboarded:${session.address.toLowerCase()}`;
-        const isDcOnboarded = localStorage.getItem(dcKey) === "true";
-
-        if (!isDcOnboarded) {
-          setLoadingState("joining-garden"); // Re-use loading state
-          setLoadingMessage("Joining DevConnect Garden...");
-          try {
-            await devConnect.join(session);
-            toastService.success({ title: "Joined DevConnect!", context: "devconnect" });
-          } catch (e) {
-            console.error("DevConnect join failed", e);
-            // Non-blocking failure
-          }
-        }
-      }
     } catch (err) {
       setLoadingState(null);
       console.error("Passkey authentication failed", err);

packages/client/src/views/Profile/Account.tsx

@@ -2,14 +2,13 @@ import { toastService } from "@green-goods/shared";
 import {
   checkGardenOpenJoining,
   isGardenMember,
-  useAutoJoinRootGarden,
   useEnsName,
   useGardens,
   useJoinGarden,
 } from "@green-goods/shared/hooks";
 import { useClientAuth } from "@green-goods/shared/providers";
 import { type Locale, useApp } from "@green-goods/shared/providers/app";
-import { capitalize, parseAndFormatError } from "@green-goods/shared/utils";
+import { capitalize, isAlreadyGardenerError, parseAndFormatError } from "@green-goods/shared/utils";
 import {
   RiCheckLine,
   RiEarthFill,
@@ -51,23 +50,17 @@ export const ProfileAccount: React.FC<ProfileAccountProps> = () => {
   const { locale, switchLanguage, availableLocales } = useApp();
   const intl = useIntl();
 
-  // Check if DevConnect is enabled via environment variable
-  const isDevConnectEnabled = import.meta.env.VITE_DEVCONNECT === "true";
-
   // Fetch all gardens
   const { data: gardens = [], isLoading: gardensLoading } = useGardens();
 
   // Join garden hook
   const { joinGarden, isJoining, joiningGardenId } = useJoinGarden();
 
-  // Root garden membership check (for DevConnect and legacy support)
-  const { devConnect } = useAutoJoinRootGarden();
-
-  // Track which gardens have openJoining enabled
+  // Track which gardens have openJoining enabled (for join button state)
   const [openGardensMap, setOpenGardensMap] = useState<Map<string, boolean>>(new Map());
   const [checkingOpenJoining, setCheckingOpenJoining] = useState(false);
 
-  // Check openJoining status for all gardens (cached)
+  // Check openJoining status for all gardens
   useEffect(() => {
     const checkOpenJoiningStatus = async () => {
       if (gardens.length === 0) return;
@@ -90,15 +83,15 @@ export const ProfileAccount: React.FC<ProfileAccountProps> = () => {
     checkOpenJoiningStatus();
   }, [gardens]);
 
-  // Consolidated list: all open gardens with membership status
-  const openGardens = useMemo(() => {
+  // Show only open gardens or gardens where user is a member
+  const allGardens = useMemo(() => {
     if (!primaryAddress || !gardens.length) return [];
 
     return gardens
       .filter((garden) => {
-        // Show gardens that are either open for joining OR user is already a member
         const isOpen = openGardensMap.get(garden.id) === true;
         const isMember = isGardenMember(primaryAddress, garden.gardeners, garden.operators);
+        // Only show gardens that are open OR user is already a member
         return isOpen || isMember;
       })
       .map((garden) => ({
@@ -126,6 +119,25 @@ export const ProfileAccount: React.FC<ProfileAccountProps> = () => {
         context: "joinGarden",
       });
     } catch (err) {
+      // Handle "already a member" as success, not error
+      if (isAlreadyGardenerError(err)) {
+        toastService.success({
+          title: intl.formatMessage({
+            id: "app.account.alreadyMember",
+            defaultMessage: "Already a member",
+          }),
+          message: intl.formatMessage(
+            {
+              id: "app.account.alreadyMemberMessage",
+              defaultMessage: "You're already a member of {gardenName}",
+            },
+            { gardenName: garden.name }
+          ),
+          context: "joinGarden",
+        });
+        return;
+      }
+
       console.error(`Failed to join garden ${garden.id}`, err);
 
       const { title, message } = parseAndFormatError(err);
@@ -139,15 +151,6 @@ export const ProfileAccount: React.FC<ProfileAccountProps> = () => {
     }
   };
 
-  const handleJoinDevConnect = async () => {
-    try {
-      await devConnect.join();
-      toastService.success({ title: "Joined DevConnect", context: "account" });
-    } catch (err) {
-      toastService.error({ title: "Failed to join", error: err, context: "account" });
-    }
-  };
-
   const handleLogout = async () => {
     try {
       await signOut();
@@ -242,13 +245,13 @@ export const ProfileAccount: React.FC<ProfileAccountProps> = () => {
         </Card>
       ))}
 
-      {/* Open Gardens Section - Consolidated list with membership status */}
+      {/* Gardens Section - All available gardens with membership status */}
       {primaryAddress && (
         <>
           <h5 className="text-label-md text-slate-900">
             {intl.formatMessage({
-              id: "app.profile.openGardens",
-              defaultMessage: "Open Gardens",
+              id: "app.profile.gardens",
+              defaultMessage: "Gardens",
             })}
           </h5>
 
@@ -263,9 +266,9 @@ export const ProfileAccount: React.FC<ProfileAccountProps> = () => {
                 </span>
               </div>
             </Card>
-          ) : openGardens.length > 0 ? (
+          ) : allGardens.length > 0 ? (
             <div className="flex flex-col gap-2">
-              {openGardens.map((garden) => {
+              {allGardens.map((garden) => {
                 const isJoiningThis = isJoining && joiningGardenId === garden.id;
 
                 return (
@@ -303,18 +306,11 @@ export const ProfileAccount: React.FC<ProfileAccountProps> = () => {
                           mode="filled"
                           size="xsmall"
                           onClick={() => handleJoinGarden(garden)}
-                          label={
-                            isJoiningThis
-                              ? intl.formatMessage({
-                                  id: "app.profile.joining",
-                                  defaultMessage: "Joining...",
-                                })
-                              : intl.formatMessage({
-                                  id: "app.profile.join",
-                                  defaultMessage: "Join",
-                                })
-                          }
-                          disabled={isJoining}
+                          label={intl.formatMessage({
+                            id: "app.profile.join",
+                            defaultMessage: "Join",
+                          })}
+                          disabled={isJoiningThis}
                           className="shrink-0"
                         />
                       )}
@@ -329,26 +325,13 @@ export const ProfileAccount: React.FC<ProfileAccountProps> = () => {
                 <RiPlantLine className="w-5 text-slate-400" />
                 <span className="text-sm text-slate-500">
                   {intl.formatMessage({
-                    id: "app.profile.noJoinableGardens",
-                    defaultMessage: "No open gardens available to join",
+                    id: "app.profile.noGardens",
+                    defaultMessage: "No gardens available",
                   })}
                 </span>
               </div>
             </Card>
           )}
-
-          {/* DevConnect Button - Optional */}
-          {isDevConnectEnabled && devConnect.isEnabled && !devConnect.isMember && (
-            <Button
-              variant="primary"
-              mode="filled"
-              onClick={handleJoinDevConnect}
-              label={devConnect.isLoading ? "Joining..." : "Join DevConnect"}
-              leadingIcon={<RiPlantLine className="w-4" />}
-              disabled={devConnect.isLoading}
-              className="w-full"
-            />
-          )}
         </>
       )}
 

packages/client/src/vite-env.d.ts

@@ -5,7 +5,6 @@ interface ImportMetaEnv {
   readonly VITE_WALLET_CONNECT_PROJECT_ID: string;
   readonly VITE_ALCHEMY_API_KEY: string;
   readonly VITE_ENVIO_INDEXER_URL: string;
-  readonly VITE_DEVCONNECT?: string;
 }
 
 interface ImportMeta {

packages/contracts/script/Deploy.s.sol

@@ -145,7 +145,8 @@ contract Deploy is Script, DeploymentBase {
                     abi.decode(vm.parseJson(gardensJson, string.concat(basePath, ".bannerImage")), (string));
 
                 string memory metadata = "";
-                try vm.parseJson(gardensJson, string.concat(basePath, ".metadata")) returns (bytes memory metadataBytes) {
+                try vm.parseJson(gardensJson, string.concat(basePath, ".metadata")) returns (bytes memory metadataBytes)
+                {
                     metadata = abi.decode(metadataBytes, (string));
                 } catch {}
 
@@ -168,6 +169,7 @@ contract Deploy is Script, DeploymentBase {
                     location: location,
                     bannerImage: bannerImage,
                     metadata: metadata,
+                    openJoining: openJoining,
                     gardeners: gardeners,
                     gardenOperators: operators
                 });
@@ -176,11 +178,6 @@ contract Deploy is Script, DeploymentBase {
                 gardenAddresses.push(gardenAddress);
                 gardenTokenIds.push(i + 1);
 
-                // Only the root garden gets open joining automatically from tokenId == 1. Others require operator call.
-                if (openJoining && GardenAccount(payable(gardenAddress)).gardenOperators(msg.sender)) {
-                    GardenAccount(payable(gardenAddress)).setOpenJoining(true);
-                }
-
                 console.log("Garden created");
                 console.log("  name", name);
                 console.log("  tokenId", i + 1);
@@ -258,7 +255,7 @@ contract Deploy is Script, DeploymentBase {
     }
 
     /// @notice Handle IPFS upload mismatch scenarios
-    function _handleIPFSMismatch(uint256 expectedCount, uint256 /* actualCount */)
+    function _handleIPFSMismatch(uint256 expectedCount, uint256 /* actualCount */ )
         internal
         view
         returns (string[] memory)

packages/contracts/script/DeployAdditionalGardens.s.sol

@@ -1,11 +1,11 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.25;
 
-import { Script } from "forge-std/Script.sol";
-import { console } from "forge-std/console.sol";
+import {Script} from "forge-std/Script.sol";
+import {console} from "forge-std/console.sol";
 
-import { GardenToken } from "../src/tokens/Garden.sol";
-import { GardenAccount } from "../src/accounts/Garden.sol";
+import {GardenToken} from "../src/tokens/Garden.sol";
+import {GardenAccount} from "../src/accounts/Garden.sol";
 
 /**
  * @title Deploy Additional Gardens
@@ -83,9 +83,7 @@ contract DeployAdditionalGardens is Script {
         string memory json,
         string memory basePath,
         uint256 index
-    )
-        internal
-    {
+    ) internal {
         console.log("\n--- Deploying Garden", index, "---");
 
         // Parse garden config
@@ -119,31 +117,23 @@ contract DeployAdditionalGardens is Script {
         console.log("Gardeners:", gardeners.length);
         console.log("Operators:", operators.length);
 
-        // Mint the garden
+        // Mint the garden with openJoining from config
         GardenToken.GardenConfig memory config = GardenToken.GardenConfig({
             communityToken: communityToken,
             name: name,
             description: description,
             location: location,
             bannerImage: bannerImage,
             metadata: metadata,
+            openJoining: openJoining,
             gardeners: gardeners,
             gardenOperators: operators
         });
         address gardenAddress = gardenToken.mintGarden(config);
 
         console.log("Garden Address:", gardenAddress);
-
-        // Set openJoining if specified in config
         if (openJoining) {
-            GardenAccount garden = GardenAccount(payable(gardenAddress));
-            // Check if caller is operator before trying to set
-            if (garden.gardenOperators(msg.sender)) {
-                garden.setOpenJoining(true);
-                console.log("Open joining enabled");
-            } else {
-                console.log("WARNING: Cannot enable open joining - caller not an operator");
-            }
+            console.log("Open joining: enabled");
         }
     }
 }