From 1c7a363935d63e253f4b44fc063da0fe28e086b6 Mon Sep 17 00:00:00 2001
From: kemuru <102478601+kemuru@users.noreply.github.com>
Date: Tue, 25 Jun 2024 08:28:00 +0200
Subject: [PATCH 1/4] chore: add graph aki to mappings context in real disputes

---
 web/src/hooks/queries/usePopulatedDisputeData.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/web/src/hooks/queries/usePopulatedDisputeData.ts b/web/src/hooks/queries/usePopulatedDisputeData.ts
index 2a9c679e3..572af8238 100644
--- a/web/src/hooks/queries/usePopulatedDisputeData.ts
+++ b/web/src/hooks/queries/usePopulatedDisputeData.ts
@@ -59,6 +59,7 @@ export const usePopulatedDisputeData = (disputeID?: string, arbitrableAddress?:
           const initialContext = {
             disputeID: disputeID,
             arbitrable: arbitrableAddress,
+            graphApiKey: process.env.GRAPH_API_KEY,
           };
 
           const data = dataMappings ? await executeActions(JSON.parse(dataMappings), initialContext) : {};

From 8404104852f1673d583f4e62f61e82df8744c796 Mon Sep 17 00:00:00 2001
From: kemuru <102478601+kemuru@users.noreply.github.com>
Date: Tue, 25 Jun 2024 08:47:34 +0200
Subject: [PATCH 2/4] feat: add externaldisputeid as context to the dispute too

---
 web/src/hooks/queries/usePopulatedDisputeData.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/web/src/hooks/queries/usePopulatedDisputeData.ts b/web/src/hooks/queries/usePopulatedDisputeData.ts
index 572af8238..5b2c40d5d 100644
--- a/web/src/hooks/queries/usePopulatedDisputeData.ts
+++ b/web/src/hooks/queries/usePopulatedDisputeData.ts
@@ -9,6 +9,7 @@ import { populateTemplate } from "@kleros/kleros-sdk/src/dataMappings/utils/popu
 import { GENESIS_BLOCK_ARBSEPOLIA } from "consts/index";
 import { useGraphqlBatcher } from "context/GraphqlBatcher";
 import { iArbitrableV2Abi } from "hooks/contracts/generated";
+import { useEvidenceGroup } from "queries/useEvidenceGroup";
 import { debounceErrorToast } from "utils/debounceErrorToast";
 import { isUndefined } from "utils/index";
 
@@ -32,6 +33,7 @@ export const usePopulatedDisputeData = (disputeID?: string, arbitrableAddress?:
   const { data: crossChainData, isError } = useIsCrossChainDispute(disputeID, arbitrableAddress);
   const isEnabled = !isUndefined(disputeID) && !isUndefined(crossChainData) && !isUndefined(arbitrableAddress);
   const { graphqlBatcher } = useGraphqlBatcher();
+  const externalDisputeID = useEvidenceGroup(disputeID, arbitrableAddress);
 
   return useQuery<DisputeDetails>({
     queryKey: [`DisputeTemplate${disputeID}${arbitrableAddress}`],
@@ -60,6 +62,7 @@ export const usePopulatedDisputeData = (disputeID?: string, arbitrableAddress?:
             disputeID: disputeID,
             arbitrable: arbitrableAddress,
             graphApiKey: process.env.GRAPH_API_KEY,
+            externalDisputeID: externalDisputeID,
           };
 
           const data = dataMappings ? await executeActions(JSON.parse(dataMappings), initialContext) : {};

From f18ffad4987ced969178735070f4b55c15baec81 Mon Sep 17 00:00:00 2001
From: kemuru <102478601+kemuru@users.noreply.github.com>
Date: Tue, 25 Jun 2024 16:49:33 +0200
Subject: [PATCH 3/4] fix: fetch externaldisputeid from query logs

---
 web/src/hooks/queries/usePopulatedDisputeData.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/src/hooks/queries/usePopulatedDisputeData.ts b/web/src/hooks/queries/usePopulatedDisputeData.ts
index 5b2c40d5d..c2ffc3673 100644
--- a/web/src/hooks/queries/usePopulatedDisputeData.ts
+++ b/web/src/hooks/queries/usePopulatedDisputeData.ts
@@ -33,7 +33,7 @@ export const usePopulatedDisputeData = (disputeID?: string, arbitrableAddress?:
   const { data: crossChainData, isError } = useIsCrossChainDispute(disputeID, arbitrableAddress);
   const isEnabled = !isUndefined(disputeID) && !isUndefined(crossChainData) && !isUndefined(arbitrableAddress);
   const { graphqlBatcher } = useGraphqlBatcher();
-  const externalDisputeID = useEvidenceGroup(disputeID, arbitrableAddress);
+  const { data: externalDisputeID } = useEvidenceGroup(disputeID, arbitrableAddress);
 
   return useQuery<DisputeDetails>({
     queryKey: [`DisputeTemplate${disputeID}${arbitrableAddress}`],
@@ -61,7 +61,7 @@ export const usePopulatedDisputeData = (disputeID?: string, arbitrableAddress?:
           const initialContext = {
             disputeID: disputeID,
             arbitrable: arbitrableAddress,
-            graphApiKey: process.env.GRAPH_API_KEY,
+            graphApiKey: import.meta.env.GRAPH_API_KEY,
             externalDisputeID: externalDisputeID,
           };
 

From 252684d9aacae8a5e9e14d2cefcd2af8962a9ecc Mon Sep 17 00:00:00 2001
From: kemuru <102478601+kemuru@users.noreply.github.com>
Date: Wed, 26 Jun 2024 12:05:01 +0200
Subject: [PATCH 4/4] fix: change api key to react-app-graph-api-key

---
 web/src/hooks/queries/usePopulatedDisputeData.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/src/hooks/queries/usePopulatedDisputeData.ts b/web/src/hooks/queries/usePopulatedDisputeData.ts
index c2ffc3673..84b14e53d 100644
--- a/web/src/hooks/queries/usePopulatedDisputeData.ts
+++ b/web/src/hooks/queries/usePopulatedDisputeData.ts
@@ -61,7 +61,7 @@ export const usePopulatedDisputeData = (disputeID?: string, arbitrableAddress?:
           const initialContext = {
             disputeID: disputeID,
             arbitrable: arbitrableAddress,
-            graphApiKey: import.meta.env.GRAPH_API_KEY,
+            graphApiKey: import.meta.env.REACT_APP_GRAPH_API_KEY,
             externalDisputeID: externalDisputeID,
           };