Merge branch 'dev' into small-fixes

1Hive · Dec 7, 2024 · 6dd634e · 6dd634e
2 parents 6d89d21 + e4305a1
commit 6dd634e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/apps/web/components/ProposalCard.tsx b/apps/web/components/ProposalCard.tsx
@@ -49,7 +49,7 @@ export type ProposalCardProps = {
   poolToken?: FetchTokenResult;
   isAllocationView: boolean;
   memberActivatedPoints: bigint;
-  memberPoolWeight: number;
+  memberPoolWeight?: number;
   executeDisabled: boolean;
   tokenDecimals: number;
   alloInfo: Allo;

diff --git a/apps/web/components/Proposals.tsx b/apps/web/components/Proposals.tsx
@@ -483,7 +483,7 @@ export function Proposals({
           {allocationView && <UserAllocationStats stats={stats} />}
         </div>
         <div className="flex flex-col gap-6">
-          {proposals && inputs && memberPoolWeight != null ?
+          {proposals && inputs ?
             <>
               {proposals
                 .filter(
@@ -500,7 +500,7 @@ export function Proposals({
                       stakedFilter={stakedFilters[proposalData.id]}
                       isAllocationView={allocationView}
                       memberActivatedPoints={memberActivatedPoints}
-                      memberPoolWeight={memberPoolWeight ?? 0}
+                      memberPoolWeight={memberPoolWeight}
                       executeDisabled={
                         proposalData.proposalStatus == 4 ||
                         !isConnected ||

diff --git a/pkg/subgraph/src/scripts/list-proxies.cjs b/pkg/subgraph/src/scripts/list-proxies.cjs
@@ -4,7 +4,7 @@ const subgraphConfig = require("../../../../apps/web/configs/subgraph.json");
 
 const localhostSubgraph = "http://localhost:8000/subgraphs/name/kamikazebr/gv2";
 const arbitrumSepoliaSubgraph =
-  "https://api.studio.thegraph.com/query/40931/gardens-v2---arbitrum-sepolia/" +
+  "https://api.studio.thegraph.com/query/70985/gardens-v2---arbitrum-sepolia/" +
   subgraphConfig.VERSION_TESTNET;
 
 const arbitrumSubgraph =