Dev

apps/web/app/(app)/gardens/[chain]/[garden]/[community]/[poolId]/create-proposal/page.tsx

@@ -15,7 +15,7 @@ export default function Page({
 }) {
   const { data } = useSubgraphQuery<getPoolDataQuery>({
     query: getPoolDataDocument,
-    variables: { poolId: poolId, garden: garden },
+    variables: { poolId: poolId, garden: garden.toLowerCase() },
   });
   const strategyObj = data?.cvstrategies?.[0];
 

apps/web/app/(app)/gardens/[chain]/[garden]/[community]/[poolId]/page.tsx

@@ -1,6 +1,6 @@
 "use client";
 
-import { useEffect } from "react";
+import { useEffect, useRef } from "react";
 import { Address } from "viem";
 import { useToken } from "wagmi";
 import {
@@ -27,10 +27,11 @@ export default function Page({
   params: { chain: string; poolId: number; garden: string };
 }) {
   const searchParams = useCollectQueryParams();
+  const proposalSectionRef = useRef<HTMLDivElement>(null);
 
   const { data, refetch, error } = useSubgraphQuery<getPoolDataQuery>({
     query: getPoolDataDocument,
-    variables: { poolId: poolId, garden: garden },
+    variables: { poolId: poolId, garden: garden.toLowerCase() },
     changeScope: [
       {
         topic: "pool",
@@ -55,7 +56,6 @@ export default function Page({
       },
     ],
   });
-
   const strategyObj = data?.cvstrategies?.[0];
   const poolTokenAddr = strategyObj?.token as Address;
   const proposalType = strategyObj?.config.proposalType;
@@ -105,6 +105,23 @@ export default function Page({
 
   const tokenGarden = data?.tokenGarden;
 
+  const maxAmount = strategyObj?.config?.maxAmount ?? 0;
+
+  useEffect(() => {
+    if (
+      searchParams[QUERY_PARAMS.poolPage.allocationView] !== undefined &&
+      proposalSectionRef.current
+    ) {
+      const elementTop =
+        proposalSectionRef.current.getBoundingClientRect().top + window.scrollY;
+      window.scrollTo({
+        top: elementTop - 130,
+        behavior: "smooth",
+      });
+    }
+    // setAllocationView(searchParams[QUERY_PARAMS.poolPage.allocationView]);
+  }, [proposalSectionRef.current, searchParams]);
+
   if (!tokenGarden || (!poolToken && PoolTypes[proposalType] === "funding")) {
     return (
       <div className="mt-96">
@@ -133,7 +150,7 @@ export default function Page({
         poolId={poolId}
         ipfsResult={ipfsResult}
         isEnabled={isEnabled}
-        chainId={chain}
+        maxAmount={maxAmount}
       />
       {isEnabled && (
         <>
@@ -147,6 +164,10 @@ export default function Page({
               chainId={chain}
             />
           )}
+        </>
+      )}
+      {strategyObj && isEnabled && (
+        <section ref={proposalSectionRef}>
           <Proposals
             poolToken={poolToken}
             strategy={strategyObj}
@@ -155,7 +176,7 @@ export default function Page({
             createProposalUrl={`/gardens/${chain}/${garden}/${communityAddress}/${poolId}/create-proposal`}
             proposalType={proposalType}
           />
-        </>
+        </section>
       )}
     </div>
   );

apps/web/app/(app)/gardens/[chain]/[garden]/[community]/create-pool/page.tsx

@@ -17,7 +17,10 @@ export default function Page({
 }) {
   const { data: result } = useSubgraphQuery<getPoolCreationDataQuery>({
     query: getPoolCreationDataDocument,
-    variables: { communityAddr: community, tokenAddr: garden },
+    variables: {
+      communityAddr: community.toLowerCase(),
+      tokenAddr: garden.toLowerCase(),
+    },
   });
   let token = result?.tokenGarden;
   let alloAddr = result?.allos[0]?.id as Address;

apps/web/app/(app)/gardens/[chain]/[garden]/[community]/page.tsx

@@ -1,17 +1,17 @@
 "use client";
 
-import React, { useEffect, useRef, useState } from "react";
+import React, { Fragment, useEffect, useRef, useState } from "react";
 import {
   CurrencyDollarIcon,
   PlusIcon,
   RectangleGroupIcon,
   UserGroupIcon,
 } from "@heroicons/react/24/outline";
-import { Dnum } from "dnum";
+import { Dnum, multiply } from "dnum";
 import Image from "next/image";
 import Link from "next/link";
 import { Address } from "viem";
-import { useAccount, useToken } from "wagmi";
+import { useAccount, useContractRead, useToken } from "wagmi";
 import {
   getCommunityDocument,
   getCommunityQuery,
@@ -38,10 +38,10 @@ import { QUERY_PARAMS } from "@/constants/query-params";
 import { useCollectQueryParams } from "@/contexts/collectQueryParams.context";
 import { useDisableButtons } from "@/hooks/useDisableButtons";
 import { useSubgraphQuery } from "@/hooks/useSubgraphQuery";
+import { safeABI } from "@/src/generated";
 import { PoolTypes } from "@/types";
 import { fetchIpfs } from "@/utils/ipfsUtils";
 import {
-  dn,
   parseToken,
   SCALE_PRECISION,
   SCALE_PRECISION_DECIMALS,
@@ -66,15 +66,29 @@ export default function Page({
     refetch,
   } = useSubgraphQuery<getCommunityQuery>({
     query: getCommunityDocument,
-    variables: { communityAddr: communityAddr, tokenAddr: tokenAddr },
+    variables: {
+      communityAddr: communityAddr.toLowerCase(),
+      tokenAddr: tokenAddr.toLowerCase(),
+    },
     changeScope: [
       { topic: "community", id: communityAddr },
       { topic: "member", containerId: communityAddr },
     ],
   });
-
   const registryCommunity = result?.registryCommunity;
 
+  const { data: isCouncilMember } = useContractRead({
+    address: registryCommunity?.councilSafe as Address,
+    abi: safeABI,
+    functionName: "isOwner",
+    chainId: Number(chain),
+    enabled: !!accountAddress,
+    args: [accountAddress as Address],
+    onError: () => {
+      console.error("Error reading isOwner from Coucil Safe");
+    },
+  });
+
   let {
     communityName,
     members,
@@ -143,7 +157,35 @@ export default function Page({
   );
   const activePools = strategies?.filter((strategy) => strategy?.isEnabled);
 
-  const poolsInReview = strategies.filter((strategy) => !strategy.isEnabled);
+  const poolsInReview = strategies.filter(
+    (strategy) => !strategy.isEnabled && !strategy.archived,
+  );
+
+  const poolsArchived = strategies.filter((strategy) => strategy.archived);
+
+  // const [tokenDataArray, setTokenDataArray] = useState([]);
+
+  // useEffect(() => {
+  //   // Initialize an empty array for holding token data for each pool
+  //   const newTokenDataArray = fundingPools.map((pool) => ({
+  //     poolId: pool.poolId,
+  //     tokenData: null ,
+  //   }));
+
+  //   // Iterate over each pool and use `useToken` to get token data
+  //   fundingPools.forEach((pool, index) => {
+  //     const { data } = useToken({
+  //       address: pool.token as Address,
+  //       chainId: +chain,
+  //     });
+
+  //     // Update the tokenData in the array for this specific pool
+  //     newTokenDataArray[index].tokenData = data;
+  //   });
+
+  //   // Once data is fetched, update the state
+  //   setTokenDataArray(newTokenDataArray);
+  // }, [fundingPools, chain]);
 
   useEffect(() => {
     const newPoolId = searchParams[QUERY_PARAMS.communityPage.newPool];
@@ -188,17 +230,17 @@ export default function Page({
       const membership = [
         BigInt(registerStakeAmount),
         Number(tokenGarden!.decimals),
-      ] as dn.Dnum;
+      ] as Dnum;
       const feePercentage = [
         BigInt(communityFee),
         SCALE_PRECISION_DECIMALS, // adding 2 decimals because 1% == 10.000 == 1e4
-      ] as dn.Dnum;
+      ] as Dnum;
 
-      return dn.multiply(membership, feePercentage);
+      return multiply(membership, feePercentage);
     } catch (err) {
       console.error(err);
     }
-    return [0n, 0] as dn.Dnum;
+    return [0n, 0] as Dnum;
   };
 
   const registrationAmount = [
@@ -238,7 +280,11 @@ export default function Page({
         <div className="flex flex-1 flex-col gap-2">
           <div>
             <h2>{communityName}</h2>
-            <EthAddress icon={false} address={communityAddr as Address} />
+            <EthAddress
+              icon={false}
+              address={communityAddr as Address}
+              label="Community address"
+            />
           </div>
           <div className="flex flex-col gap-2">
             <Statistic
@@ -311,14 +357,9 @@ export default function Page({
           </h4>
           <div className="flex flex-row flex-wrap gap-10">
             {fundingPools.map((pool) => (
-              <PoolCard
-                key={pool.poolId}
-                tokenGarden={{
-                  decimals: tokenGarden?.decimals ?? 18,
-                  symbol: tokenGarden?.symbol ?? "",
-                }}
-                pool={pool}
-              />
+              <Fragment key={pool.poolId}>
+                <PoolCard token={pool.token} chainId={chain} pool={pool} />
+              </Fragment>
             ))}
           </div>
         </div>
@@ -330,10 +371,8 @@ export default function Page({
             {signalingPools.map((pool) => (
               <PoolCard
                 key={pool.poolId}
-                tokenGarden={{
-                  symbol: tokenGarden?.symbol ?? "",
-                  decimals: tokenGarden?.decimals ?? 18,
-                }}
+                token={pool.token}
+                chainId={chain}
                 pool={pool}
               />
             ))}
@@ -347,15 +386,33 @@ export default function Page({
             {poolsInReview.map((pool) => (
               <PoolCard
                 key={pool.poolId}
-                tokenGarden={{
-                  decimals: tokenGarden?.decimals ?? 18,
-                  symbol: tokenGarden?.symbol ?? "",
-                }}
+                token={pool.token}
+                chainId={chain}
                 pool={pool}
               />
             ))}
           </div>
         </div>
+        {(!!isCouncilMember ||
+          accountAddress?.toLowerCase() ===
+            registryCommunity.councilSafe?.toLowerCase() ||
+          localStorage.getItem("showArchived") === "true") && (
+          <div className="flex flex-col gap-4">
+            <h4 className="text-secondary-content">
+              Pools archived ({poolsArchived.length})
+            </h4>
+            <div className="flex flex-row flex-wrap gap-10">
+              {poolsArchived.map((pool) => (
+                <PoolCard
+                  key={pool.poolId}
+                  token={pool.token}
+                  chainId={chain}
+                  pool={pool}
+                />
+              ))}
+            </div>
+          </div>
+        )}
       </section>
       <section ref={covenantSectionRef} className="section-layout">
         <h2 className="mb-4">Covenant</h2>

apps/web/app/(app)/gardens/[chain]/[garden]/create-community/page.tsx

@@ -19,7 +19,7 @@ export default function Page({
   const { data: result, error: getCommunityCreationDataQueryError } =
     useSubgraphQuery<getCommunityCreationDataQuery>({
       query: getCommunityCreationDataDocument,
-      variables: { addr: garden },
+      variables: { addr: garden.toLowerCase() },
     });
 
   useEffect(() => {

apps/web/app/(app)/gardens/page.tsx

@@ -47,10 +47,26 @@ export default function Page() {
       return (
         <>
           {tokenGardens
-            .sort(
-              (a, b) =>
-                (a.communities?.length ?? 0) - (b.communities?.length ?? 0),
-            )
+            .sort((a, b) => {
+              const communitiesDiff =
+                (b.communities?.length ?? 0) - (a.communities?.length ?? 0);
+
+              if (communitiesDiff === 0) {
+                const aTotalMembers =
+                  a.communities?.reduce(
+                    (sum, community) => sum + (community.members?.length ?? 0),
+                    0,
+                  ) ?? 0;
+                const bTotalMembers =
+                  b.communities?.reduce(
+                    (sum, community) => sum + (community.members?.length ?? 0),
+                    0,
+                  ) ?? 0;
+                return bTotalMembers - aTotalMembers;
+              }
+
+              return communitiesDiff;
+            })
             .map((garden) => (
               <div key={garden.id}>
                 <GardenCard garden={garden} />
@@ -81,7 +97,7 @@ export default function Page() {
   return (
     <>
       <div className="flex flex-col items-center justify-center gap-8 relative">
-        <header className="flex flex-col items-center gap-8 2xl:mt-20">
+        <header className="flex flex-col items-center gap-8">
           <div className="flex items-center text-center">
             <div className="relative flex-1">
               <Image src={clouds1} alt="clouds" width={205} height={205} />

apps/web/app/page.tsx

@@ -3,4 +3,4 @@ import { redirect } from "next/navigation";
 
 export default function Page() {
   redirect("/gardens");
-}
+}

apps/web/components/ActivatePoints.tsx

@@ -11,7 +11,6 @@ import useCheckAllowList from "@/hooks/useCheckAllowList";
 import { useContractWriteWithConfirmations } from "@/hooks/useContractWriteWithConfirmations";
 import { ConditionObject, useDisableButtons } from "@/hooks/useDisableButtons";
 import { cvStrategyABI } from "@/src/generated";
-import { abiWithErrors } from "@/utils/abi";
 import { useErrorDetails } from "@/utils/getErrorName";
 
 type ActiveMemberProps = {
@@ -40,7 +39,7 @@ export function ActivatePoints({
       chainId,
       address: strategy.id as Address,
       contractName: "CV Strategy",
-      abi: abiWithErrors(cvStrategyABI),
+      abi: cvStrategyABI,
       functionName: "activatePoints",
       fallbackErrorMessage: "Error activating points, please report a bug.",
       onConfirmations: () => {
@@ -58,7 +57,7 @@ export function ActivatePoints({
   const { write: writeDeactivatePoints, error: errorDeactivatePoints } =
     useContractWriteWithConfirmations({
       address: strategy.id as Address,
-      abi: abiWithErrors(cvStrategyABI),
+      abi: cvStrategyABI,
       contractName: "CV Strategy",
       functionName: "deactivatePoints",
       fallbackErrorMessage: "Error deactivating points, please report a bug.",
@@ -117,7 +116,7 @@ export function ActivatePoints({
       btnStyle={isMemberActivated ? "outline" : "filled"}
       color={isMemberActivated ? "danger" : "primary"}
       disabled={missmatchUrl || disableActiveBtn || !isAllowed}
-      tooltip={String(tooltipMessage)}
+      tooltip={tooltipMessage}
     >
       {isMemberActivated ? "Deactivate governance" : "Activate governance"}
     </Button>