Merge pull request #448 from 1Hive/fix-ci

Fix new created entity outlined
1Hive · Oct 4, 2024 · 1aaaab9 · 1aaaab9
2 parents d5dc494 + 7c98b8d
commit 1aaaab9
Show file tree

Hide file tree

Showing 29 changed files with 10,776 additions and 8,581 deletions.
diff --git a/apps/web/actions/getProposals.ts b/apps/web/actions/getProposals.ts
diff --git a/apps/web/app/(app)/gardens/[chain]/[garden]/[community]/[poolId]/create-proposal/page.tsx b/apps/web/app/(app)/gardens/[chain]/[garden]/[community]/[poolId]/create-proposal/page.tsx
@@ -1,7 +1,6 @@
 "use client";
 
 import React from "react";
-import { Address } from "viem";
 import { getPoolDataDocument, getPoolDataQuery } from "#/subgraph/.graphclient";
 import { ProposalForm } from "@/components/Forms";
 import { LoadingSpinner } from "@/components/LoadingSpinner";
@@ -61,7 +60,6 @@ export default function Page({
           proposalType={proposalType}
           alloInfo={alloInfo}
           tokenGarden={tokenGarden}
-          tokenAddress={garden as Address}
           spendingLimit={poolAmountSpendingLimit}
           spendingLimitPct={spendingLimitPct}
           poolAmount={poolAmount}

diff --git a/apps/web/app/(app)/gardens/[chain]/[garden]/[community]/[poolId]/page.tsx b/apps/web/app/(app)/gardens/[chain]/[garden]/[community]/[poolId]/page.tsx
@@ -12,7 +12,7 @@ import { PoolMetrics, Proposals } from "@/components";
 import { LoadingSpinner } from "@/components/LoadingSpinner";
 import PoolHeader from "@/components/PoolHeader";
 import { QUERY_PARAMS } from "@/constants/query-params";
-import { useCollectQueryParams } from "@/hooks/useCollectQueryParams";
+import { useCollectQueryParams } from "@/contexts/collectQueryParams.context";
 import { useMetadataIpfsFetch } from "@/hooks/useIpfsFetch";
 import { useSubgraphQuery } from "@/hooks/useSubgraphQuery";
 import { PoolTypes } from "@/types";
@@ -44,6 +44,7 @@ export default function Page({
       },
     ],
   });
+
   const strategyObj = data?.cvstrategies?.[0];
   const poolTokenAddr = strategyObj?.token as Address;
   const { data: poolToken } = useToken({
@@ -74,12 +75,18 @@ export default function Page({
   }, [strategyObj?.config, strategyObj?.config, strategyObj?.poolAmount]);
 
   useEffect(() => {
-    const newProposalId = searchParams[QUERY_PARAMS.poolPage.newPropsoal];
-    if (
-      newProposalId &&
-      data &&
-      !strategyObj?.proposals.some((c) => c.proposalNumber === newProposalId)
-    ) {
+    const newProposalId = searchParams[QUERY_PARAMS.poolPage.newProposal];
+    if (!strategyObj) {
+      return;
+    }
+    const fetchedProposals = strategyObj?.proposals.map((p) =>
+      p.proposalNumber.toString(),
+    );
+    if (newProposalId && !fetchedProposals.includes(newProposalId)) {
+      console.debug("Pool: New proposal not yet fetched, refetching...", {
+        newProposalId,
+        fetchedProposals,
+      });
       refetch();
     }
   }, [searchParams, strategyObj?.proposals]);

diff --git a/apps/web/app/(app)/gardens/[chain]/[garden]/[community]/page.tsx b/apps/web/app/(app)/gardens/[chain]/[garden]/[community]/page.tsx
@@ -34,7 +34,7 @@ import MarkdownWrapper from "@/components/MarkdownWrapper";
 import { TokenGardenFaucet } from "@/components/TokenGardenFaucet";
 import { isProd } from "@/configs/isProd";
 import { QUERY_PARAMS } from "@/constants/query-params";
-import { useCollectQueryParams } from "@/hooks/useCollectQueryParams";
+import { useCollectQueryParams } from "@/contexts/collectQueryParams.context";
 import { useDisableButtons } from "@/hooks/useDisableButtons";
 import { useSubgraphQuery } from "@/hooks/useSubgraphQuery";
 import { PoolTypes } from "@/types";
@@ -146,11 +146,16 @@ export default function Page({
 
   useEffect(() => {
     const newPoolId = searchParams[QUERY_PARAMS.communityPage.newPool];
+    const fetchedPools = poolsInReview.some((c) => c.poolId === newPoolId);
     if (
       newPoolId &&
       result &&
-      !poolsInReview.some((c) => c.poolId === newPoolId)
+      !poolsInReview.some((p) => p.poolId === newPoolId)
     ) {
+      console.debug("Community: New pool not yet fetched, refetching...", {
+        newPoolId,
+        fetchedPools,
+      });
       refetch();
     }
   }, [searchParams, poolsInReview]);

diff --git a/apps/web/app/(app)/gardens/[chain]/[garden]/page.tsx b/apps/web/app/(app)/gardens/[chain]/[garden]/page.tsx
@@ -26,7 +26,7 @@ import { LoadingSpinner } from "@/components/LoadingSpinner";
 import { TokenGardenFaucet } from "@/components/TokenGardenFaucet";
 import { isProd } from "@/configs/isProd";
 import { QUERY_PARAMS } from "@/constants/query-params";
-import { useCollectQueryParams } from "@/hooks/useCollectQueryParams";
+import { useCollectQueryParams } from "@/contexts/collectQueryParams.context";
 import { useDisableButtons } from "@/hooks/useDisableButtons";
 import { useSubgraphQuery } from "@/hooks/useSubgraphQuery";
 
@@ -80,15 +80,19 @@ export default function Page({
   useEffect(() => {
     const newCommunityId =
       searchParams[QUERY_PARAMS.gardenPage.newCommunity]?.toLowerCase();
-
+    const fetchedCommunities = communities.map((c) => c.id.toLowerCase());
     if (
       newCommunityId &&
       result &&
-      !communities.some((c) => c.id.toLowerCase() === newCommunityId)
+      !fetchedCommunities.includes(newCommunityId)
     ) {
+      console.debug("Garden: New pool not yet fetched, refetching...", {
+        newCommunityId,
+        fetchedCommunities,
+      });
       refetch();
     }
-  }, [searchParams, result]);
+  }, [searchParams, communities]);
 
   if (!result) {
     return (

diff --git a/apps/web/app/api/ipfs/[hash]/route.ts b/apps/web/app/api/ipfs/[hash]/route.ts
@@ -15,6 +15,19 @@ export async function GET(req: NextRequest, { params }: Params) {
     },
   });
 
+  if (!res.ok) {
+    return Response.json(
+      {
+        message: "Error fetching IPFS content",
+        status: res.status,
+        details: await res.text(),
+      },
+      {
+        status: res.status ?? 500,
+      },
+    );
+  }
+
   if (searchParams.get("isText") === "true") {
     const text = await res.text();
     return Response.json({ text }, { status: 200 });

diff --git a/apps/web/components/CommunityCard.tsx b/apps/web/components/CommunityCard.tsx
@@ -8,7 +8,7 @@ import { Card } from "./Card";
 import { Statistic } from "./Statistic";
 import { commImg } from "@/assets";
 import { QUERY_PARAMS } from "@/constants/query-params";
-import { useCollectQueryParams } from "@/hooks/useCollectQueryParams";
+import { useCollectQueryParams } from "@/contexts/collectQueryParams.context";
 
 type CommunityCardProps = {
   name: string;

diff --git a/apps/web/components/Forms/ProposalForm.tsx b/apps/web/components/Forms/ProposalForm.tsx
@@ -42,7 +42,6 @@ type ProposalFormProps = {
   proposalType: number;
   alloInfo: Pick<Allo, "id" | "chainId" | "tokenNative">;
   tokenGarden: Pick<TokenGarden, "symbol" | "decimals">;
-  tokenAddress: Address;
   spendingLimit: number;
   spendingLimitPct: number;
   poolAmount: number;
@@ -116,7 +115,6 @@ export const ProposalForm = ({
   proposalType,
   alloInfo,
   tokenGarden,
-  tokenAddress,
   spendingLimit,
   spendingLimitPct,
 }: ProposalFormProps) => {
@@ -217,16 +215,15 @@ export const ProposalForm = ({
         id: proposalId.toString(), // proposalId is a bigint
         chainId,
       });
+      setLoading(false);
       if (pathname) {
-        router.push(
-          pathname.replace(
-            "/create-proposal",
-            `?${QUERY_PARAMS.poolPage.newPropsoal}=${proposalId}`,
-          ),
+        const newPath = pathname.replace(
+          "/create-proposal",
+          `?${QUERY_PARAMS.poolPage.newProposal}=${proposalId}`,
         );
+        router.push(newPath);
       }
     },
-    onSettled: () => setLoading(false),
   });
 
   const poolTokenAddr = strategy?.token as Address;
@@ -265,7 +262,7 @@ export const ProposalForm = ({
       poolId,
       previewData.beneficiary,
       requestedAmount,
-      tokenAddress,
+      poolTokenAddr,
       metadata,
     ]);
 
@@ -275,19 +272,11 @@ export const ProposalForm = ({
         previewData?.beneficiary ||
           "0x0000000000000000000000000000000000000000",
         requestedAmount,
-        tokenAddress,
+        poolTokenAddr,
         metadata,
       ],
     ]);
 
-    console.debug(
-      poolId,
-      previewData.beneficiary,
-      requestedAmount,
-      tokenAddress,
-      metadata,
-    );
-
     return encodedData;
   };
 

diff --git a/apps/web/components/PoolCard.tsx b/apps/web/components/PoolCard.tsx
@@ -17,7 +17,7 @@ import {
 import { blueLand, grass } from "@/assets";
 import { Badge, Card, DisplayNumber, Statistic } from "@/components";
 import { QUERY_PARAMS } from "@/constants/query-params";
-import { useCollectQueryParams } from "@/hooks/useCollectQueryParams";
+import { useCollectQueryParams } from "@/contexts/collectQueryParams.context";
 import { PointSystems, PoolTypes } from "@/types";
 import { capitalize } from "@/utils/text";
 
@@ -42,7 +42,7 @@ export function PoolCard({ pool, tokenGarden }: Props) {
   const poolType = config?.proposalType as number | undefined;
 
   const isNewPool =
-    searchParams[QUERY_PARAMS.communityPage.newPool] === pool.poolId;
+    searchParams[QUERY_PARAMS.communityPage.newPool] === pool.poolId.toString();
   return (
     <Card
       href={`${pathname}/${poolId}`}

diff --git a/apps/web/components/PoolGovernance.tsx b/apps/web/components/PoolGovernance.tsx
@@ -3,24 +3,31 @@
 import React from "react";
 import { Dnum } from "dnum";
 import { Address, useAccount } from "wagmi";
+import {
+  CVStrategy,
+  CVStrategyConfig,
+  TokenGarden,
+} from "#/subgraph/.graphclient";
 import {
   ActivatePoints,
   Badge,
   DisplayNumber,
   CheckPassport,
   InfoBox,
 } from "@/components/";
-import { LightCVStrategy } from "@/types";
 
-interface PoolGovernanceProps {
+export type PoolGovernanceProps = {
   memberPoolWeight: number;
   tokenDecimals: number;
-  strategy: LightCVStrategy;
+  strategy: Pick<CVStrategy, "id"> & {
+    registryCommunity: { garden: Pick<TokenGarden, "symbol"> };
+    config: Pick<CVStrategyConfig, "pointSystem">;
+  };
   communityAddress: Address;
   memberTokensInCommunity: number;
   isMemberCommunity: boolean;
   memberActivatedStrategy: boolean;
-}
+};
 
 export const PoolGovernance: React.FC<PoolGovernanceProps> = ({
   memberPoolWeight,

diff --git a/apps/web/components/PoolHeader.tsx b/apps/web/components/PoolHeader.tsx
@@ -243,10 +243,8 @@ export default function PoolHeader({
       <header className="mb-2 flex flex-col">
         <div className="flex justify-between flex-wrap">
           <div>
-            <h2>
-              {ipfsResult?.title}
-              <h5 className="">#{poolId}</h5>
-            </h2>
+            <h2>{ipfsResult?.title}</h2>
+            <h5 className="">#{poolId}</h5>
           </div>
           {(isCouncilMember ?? isCouncilSafe) && (
             // true