Merge branch 'dev' into beta

1Hive · Dec 6, 2024 · df21908 · df21908
2 parents 9336538 + e4305a1
commit df21908
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 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/apps/web/configs/chains.tsx b/apps/web/configs/chains.tsx
@@ -64,8 +64,9 @@ const getSubgraphUrls = (
   publishedId: string,
   subgraphSlug: string,
   subgraphVersion: string,
+  accountNumber: number = 40931,
 ) => {
-  const versionedEndpoint = `https://api.studio.thegraph.com/query/40931/${subgraphSlug}`;
+  const versionedEndpoint = `https://api.studio.thegraph.com/query/${accountNumber}/${subgraphSlug}`;
   return {
     publishedSubgraphUrl:
       process.env.NEXT_PUBLIC_SUBGRAPH_KEY ?
@@ -104,6 +105,7 @@ export const chainConfigMap: {
       "BfZYwhZ1rTb22Nah1u6YyXtUtAdgGNtZhW1EBb4mFzAU",
       "gardens-v2---arbitrum-sepolia",
       SUBGRAPH_TESTNET_VERSION,
+      70985,
     ),
     globalTribunal: "0xb05A948B5c1b057B88D381bDe3A375EfEA87EbAD",
     allo: "0x1133eA7Af70876e64665ecD07C0A0476d09465a1",

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 =