Merge branch 'dev' into beta

1Hive · Dec 2, 2024 · 9336538 · 9336538
2 parents 74f5d98 + 50e4132
commit 9336538
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 10 deletions.
diff --git a/apps/web/components/DisputeButton.tsx b/apps/web/components/DisputeButton.tsx
@@ -146,7 +146,7 @@ export const DisputeButton: FC<Props> = ({
   const { data: isTribunalMember } = useContractRead({
     address: arbitrationConfig.tribunalSafe as Address,
     abi: safeABI,
-    functionName: "isOwner",
+    functionName: "isOwner" as any,
     chainId: Number(chainId),
     enabled: !!address,
     args: [address as Address],
@@ -473,7 +473,7 @@ export const DisputeButton: FC<Props> = ({
             btnStyle="outline"
             onClick={() => setIsModalOpened(true)}
           >
-            {isDisputed ?? isProposalEnded ? "Open dispute" : "Dispute"}
+            {(isDisputed ?? isProposalEnded) ? "Open dispute" : "Dispute"}
           </Button>
           <Modal
             title={`Disputed Proposal: ${proposalData.title} #${proposalData.proposalNumber}`}

diff --git a/apps/web/configs/chains.tsx b/apps/web/configs/chains.tsx
@@ -227,6 +227,8 @@ export const chainConfigMap: {
   // },
 };
 
+console.debug("ChainConfigMap", chainConfigMap);
+
 export function getConfigByChain(chainId: ChainId): ChainData | undefined {
   if (chainId in chainConfigMap) {
     return chainConfigMap[chainId];

diff --git a/turbo.json b/turbo.json
@@ -44,14 +44,6 @@
         "NEXT_PUBLIC_GLOBAL_TRIBUNAL_ADDRESS",
         "NEXT_PUBLIC_WALLET_CONNECT_ID",
         "NEXT_PUBLIC_DEFAULT_RULING_TIMEOUT",
-        "NEXT_PUBLIC_SUBGRAPH_URL_ARB_SEP",
-        "NEXT_PUBLIC_SUBGRAPH_URL_OP_SEP",
-        "NEXT_PUBLIC_SUBGRAPH_URL_ETH_SEP",
-        "NEXT_PUBLIC_SUBGRAPH_URL_ARBITRUM",
-        "NEXT_PUBLIC_SUBGRAPH_URL_ETHEREUM",
-        "NEXT_PUBLIC_SUBGRAPH_URL_OPTIMISM",
-        "NEXT_PUBLIC_SUBGRAPH_URL_MATIC",
-        "NEXT_PUBLIC_SUBGRAPH_URL_GNOSIS",
         "RPC_URL_ARB_TESTNET",
         "RPC_URL_OP_TESTNET",
         "RPC_URL_ETH_TESTNET",