Fixed wrong token + Access proposal support from proposal Details page

1Hive · Nov 14, 2024 · 68c28bd · 68c28bd
1 parent 8d846de
commit 68c28bd
Show file tree

Hide file tree

Showing 11 changed files with 164 additions and 79 deletions.
diff --git a/apps/web/app/(app)/gardens/[chain]/[garden]/[community]/[poolId]/[proposalId]/page.tsx b/apps/web/app/(app)/gardens/[chain]/[garden]/[community]/[poolId]/[proposalId]/page.tsx
@@ -1,7 +1,7 @@
 "use client";
 import { useEffect } from "react";
 import { Hashicon } from "@emeraldpay/hashicon-react";
-import { InformationCircleIcon, UserIcon } from "@heroicons/react/24/outline";
+import { AdjustmentsHorizontalIcon, InformationCircleIcon, UserIcon } from "@heroicons/react/24/outline";
 import { toast } from "react-toastify";
 import { Address, encodeAbiParameters, formatUnits } from "viem";
 import { useAccount, useToken } from "wagmi";
@@ -33,6 +33,8 @@ import { PoolTypes, ProposalStatus } from "@/types";
 
 import { useErrorDetails } from "@/utils/getErrorName";
 import { prettyTimestamp } from "@/utils/text";
+import { usePathname,useRouter } from "next/navigation";
+import { QUERY_PARAMS } from "@/constants/query-params";
 
 export default function Page({
   params: { proposalId, garden, poolId },
@@ -73,6 +75,8 @@ export default function Page({
     hash: proposalData?.metadataHash,
     enabled: !proposalData?.metadata,
   });
+  const router = useRouter();
+  const path = usePathname();
   const metadata = proposalData?.metadata ?? ipfsResult;
   const isProposerConnected =
     proposalData?.submitter === address?.toLowerCase();
@@ -89,6 +93,7 @@ export default function Page({
     enabled: !!poolTokenAddr && !isSignalingType,
     chainId,
   });
+
 
   const {
     currentConvictionPct,
@@ -137,6 +142,15 @@ export default function Page({
     },
   });
 
+  const manageSupportClicked = () => { 
+    const pathSegments = path.split("/");
+    pathSegments.pop();
+    if (pathSegments.length === 3) {
+      pathSegments.pop();
+    }
+    const newPath = pathSegments.join("/");
+    router.push(newPath+`?${QUERY_PARAMS.poolPage.allocationView}=true`,);
+  }
   const distributeErrorName = useErrorDetails(errorDistribute);
   useEffect(() => {
     if (isErrorDistribute && distributeErrorName.errorName !== undefined) {
@@ -246,6 +260,8 @@ export default function Page({
             <div className="flex justify-between">
               <h2>Metrics</h2>
               {status === "active" && !isSignalingType && (
+
+
                 <Button
                   onClick={() =>
                     writeDistribute?.({
@@ -280,6 +296,17 @@ export default function Page({
               onReadyToExecute={triggerConvictionRefetch}
               defaultChartMaxValue
             />
+            <Button
+                      icon={
+                        <AdjustmentsHorizontalIcon height={24} width={24} />
+                      }
+                      onClick={() => manageSupportClicked()}
+                      // disabled={disableManSupportButton || !isAllowed}
+                      // tooltip={tooltipMessage}
+                    >
+                      Manage support
+                    </Button>
+
           </>
         }
       </section>

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
@@ -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,6 +27,7 @@ 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,
@@ -55,7 +56,7 @@ export default function Page({
       },
     ],
   });
-
+  console.log("data", data);
   const strategyObj = data?.cvstrategies?.[0];
   const poolTokenAddr = strategyObj?.token as Address;
   const proposalType = strategyObj?.config.proposalType;
@@ -102,9 +103,25 @@ export default function Page({
       refetch();
     }
   }, [searchParams, strategyObj?.proposals]);
-
+  
   const tokenGarden = data?.tokenGarden;
 
+  useEffect(() => {
+    console.log("QUERY PARAM ALLOCATION",searchParams[QUERY_PARAMS.poolPage.allocationView]);
+    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">
@@ -146,14 +163,18 @@ export default function Page({
               chainId={chain}
             />
           )}
+        <section ref={proposalSectionRef} className="section-layout">
+
           <Proposals
             poolToken={poolToken}
             strategy={strategyObj}
             alloInfo={alloInfo}
             communityAddress={communityAddress}
             createProposalUrl={`/gardens/${chain}/${garden}/${communityAddress}/${poolId}/create-proposal`}
             proposalType={proposalType}
+            allocationViewInit={searchParams[QUERY_PARAMS.poolPage.allocationView] === "true"}
           />
+        </section>
         </>
       )}
     </div>

diff --git a/apps/web/app/(app)/gardens/[chain]/[garden]/[community]/page.tsx b/apps/web/app/(app)/gardens/[chain]/[garden]/[community]/page.tsx
@@ -1,6 +1,6 @@
 "use client";
 
-import React, { useEffect, useRef, useState } from "react";
+import React, { Fragment, useEffect, useRef, useState } from "react";
 import {
   CurrencyDollarIcon,
   PlusIcon,
@@ -75,7 +75,7 @@ export default function Page({
       { topic: "member", containerId: communityAddr },
     ],
   });
-
+  console.log(result);
   const registryCommunity = result?.registryCommunity;
 
   let {
@@ -148,6 +148,30 @@ export default function Page({
 
   const poolsInReview = strategies.filter((strategy) => !strategy.isEnabled);
 
+  // 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];
     const fetchedPools = poolsInReview.some((c) => c.poolId === newPoolId);
@@ -318,14 +342,13 @@ export default function Page({
           </h4>
           <div className="flex flex-row flex-wrap gap-10">
             {fundingPools.map((pool) => (
+              <Fragment key={pool.poolId}>
               <PoolCard
-                key={pool.poolId}
-                tokenGarden={{
-                  decimals: tokenGarden?.decimals ?? 18,
-                  symbol: tokenGarden?.symbol ?? "",
-                }}
+                token={pool.token}
+                chainId={chain}
                 pool={pool}
-              />
+                />
+              </Fragment>
             ))}
           </div>
         </div>
@@ -337,10 +360,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}
               />
             ))}
@@ -354,10 +375,8 @@ 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}
               />
             ))}

diff --git a/apps/web/components/PoolCard.tsx b/apps/web/components/PoolCard.tsx
@@ -23,19 +23,22 @@ import { useCollectQueryParams } from "@/contexts/collectQueryParams.context";
 import { useMetadataIpfsFetch } from "@/hooks/useIpfsFetch";
 import { PointSystems, PoolTypes } from "@/types";
 import { capitalize } from "@/utils/text";
+import { Address, useToken } from "wagmi";
+import { useEffect } from "react";
 
 type Props = {
-  tokenGarden: Pick<TokenGarden, "decimals" | "symbol">;
+  token: string;
   pool: Pick<
     CVStrategy,
     "id" | "isEnabled" | "poolAmount" | "poolId" | "metadata"
   > & {
     proposals: Pick<CVProposal, "id">[];
     config: Pick<CVStrategyConfig, "proposalType" | "pointSystem">;
   };
+  chainId: number;
 };
 
-export function PoolCard({ pool, tokenGarden }: Props) {
+export function PoolCard({ pool, token,chainId }: Props) {
   const pathname = usePathname();
   const searchParams = useCollectQueryParams();
 
@@ -47,6 +50,16 @@ export function PoolCard({ pool, tokenGarden }: Props) {
 
   poolAmount = poolAmount || 0;
   const poolType = config?.proposalType as number | undefined;
+  const { data: tokenGarden } = useToken({
+    address: token as Address,
+    chainId: +chainId,
+  });
+  //MAYBE: use getPoolDataQuery to get token address, but should be done
+  // from community page that already fetches pools and their data
+  useEffect(() => {
+    console.log("chainID", chainId);
+    console.log("token", token);
+  }, [chainId]);
 
   const isNewPool =
     searchParams[QUERY_PARAMS.communityPage.newPool] === pool.poolId.toString();
@@ -82,9 +95,9 @@ export function PoolCard({ pool, tokenGarden }: Props) {
         {isEnabled && poolType && PoolTypes[poolType] === "funding" && (
           <Statistic icon={<CurrencyDollarIcon />} label="funds">
             <DisplayNumber
-              number={[BigInt(poolAmount), tokenGarden.decimals]}
+              number={[BigInt(poolAmount), tokenGarden?.decimals as number]}
               compact={true}
-              tokenSymbol={tokenGarden.symbol}
+              tokenSymbol={tokenGarden?.symbol}
             />
           </Statistic>
         )}

diff --git a/apps/web/components/Proposals.tsx b/apps/web/components/Proposals.tsx
@@ -85,6 +85,7 @@ interface ProposalsProps {
   communityAddress: Address;
   createProposalUrl: string;
   proposalType: number;
+  allocationViewInit?: boolean;
 }
 
 export function Proposals({
@@ -93,9 +94,10 @@ export function Proposals({
   poolToken,
   communityAddress,
   createProposalUrl,
+  allocationViewInit
 }: ProposalsProps) {
   // State
-  const [allocationView, setAllocationView] = useState(false);
+  const [allocationView, setAllocationView] = useState(allocationViewInit ?? false);
   const [inputAllocatedTokens, setInputAllocatedTokens] = useState<number>(0);
   const [inputs, setInputs] = useState<{ [key: string]: ProposalInputItem }>(
     {},

diff --git a/apps/web/constants/query-params.ts b/apps/web/constants/query-params.ts
@@ -8,5 +8,6 @@ export const QUERY_PARAMS = {
   },
   poolPage: {
     newProposal: "newProposal",
+    allocationView: "allocationView",
   },
 } as const;
diff --git a/pkg/contracts/src/CVStrategy/CVStrategyV0_0.sol b/pkg/contracts/src/CVStrategy/CVStrategyV0_0.sol
@@ -142,21 +142,21 @@ contract CVStrategyV0_0 is BaseStrategyUpgradeable, IArbitrable, IPointStrategy,
     /*|              CUSTOM ERRORS                 |*/
     /*|--------------------------------------------|*/
 
-    // error UserCannotBeZero(); // 0xd1f28288
+    error UserCannotBeZero(); // 0xd1f28288
     error UserNotInRegistry(); //0x6a5cfb6d
     error UserIsInactive(); // 0x5fccb67f
     error PoolIsEmpty(); // 0xed4421ad
     error NotImplemented(); //0xd6234725
-    // error TokenCannotBeZero(); //0x596a094c
+    error TokenCannotBeZero(); //0x596a094c
     error TokenNotAllowed(); // 0xa29c4986
     error AmountOverMaxRatio(); // 0x3bf5ca14
     error AddressCannotBeZero(); //0xe622e040
-    // error RegistryCannotBeZero(); // 0x5df4b1ef
+    error RegistryCannotBeZero(); // 0x5df4b1ef
     error SupportUnderflow(uint256 _support, int256 _delta, int256 _result); // 0x3bbc7142
     error NotEnoughPointsToSupport(uint256 pointsSupport, uint256 pointsBalance); // 0xd64182fe
 
-    // error ProposalDataIsEmpty(); //0xc5f7c4c0
-    // error ProposalIdCannotBeZero(); //0xf881a10d
+    error ProposalDataIsEmpty(); //0xc5f7c4c0
+    error ProposalIdCannotBeZero(); //0xf881a10d
     error ProposalNotActive(uint256 _proposalId); // 0x44980d8f
     error ProposalNotInList(uint256 _proposalId); // 0xc1d17bef
     error ProposalSupportDuplicated(uint256 _proposalId, uint256 index); //0xadebb154
@@ -168,7 +168,7 @@ contract CVStrategyV0_0 is BaseStrategyUpgradeable, IArbitrable, IPointStrategy,
     error InsufficientCollateral(uint256 sentAmount, uint256 requiredAmount);
     error OnlyArbitrator();
     error ProposalNotDisputed(uint256 _proposalId);
-    // error ArbitratorCannotBeZero();
+    error ArbitratorCannotBeZero();
     error OnlySubmitter(address submitter, address sender);
     // Goss: Support Collateral Zero
     // error CollateralVaultCannotBeZero();

diff --git a/pkg/subgraph/.graphclient/index.d.ts b/pkg/subgraph/.graphclient/index.d.ts
@@ -3672,7 +3672,7 @@ export type getCommunityQueryVariables = Exact<{
 export type getCommunityQuery = {
     registryCommunity?: Maybe<(Pick<RegistryCommunity, 'communityName' | 'id' | 'covenantIpfsHash' | 'communityFee' | 'protocolFee' | 'registerStakeAmount' | 'registerToken'> & {
         members?: Maybe<Array<Pick<MemberCommunity, 'id' | 'stakedTokens'>>>;
-        strategies?: Maybe<Array<(Pick<CVStrategy, 'id' | 'isEnabled' | 'poolAmount' | 'poolId' | 'metadata'> & {
+        strategies?: Maybe<Array<(Pick<CVStrategy, 'id' | 'isEnabled' | 'poolAmount' | 'poolId' | 'token' | 'metadata'> & {
             proposals: Array<Pick<CVProposal, 'id'>>;
             config: Pick<CVStrategyConfig, 'proposalType' | 'pointSystem'>;
         })>>;