Merge branch 'dev' into feat(web)/lazy-loading

Author: alcercu

kleros-sdk/src/dataMappings/utils/populateTemplate.ts

@@ -4,7 +4,6 @@ import { validate } from "./DisputeDetailsValidator";
 
 export const populateTemplate = (mustacheTemplate: string, data: any): DisputeDetails => {
   const render = mustache.render(mustacheTemplate, data);
-  console.log("MUSTACHE RENDER: ", render);
   const dispute = JSON.parse(render);
 
   // TODO: the validation below is too strict, it should be fixed, disabled for now, FIXME

web/src/hooks/queries/usePopulatedDisputeData.ts

@@ -31,12 +31,16 @@ const disputeTemplateQuery = graphql(`
 export const usePopulatedDisputeData = (disputeID?: string, arbitrableAddress?: `0x${string}`) => {
   const publicClient = usePublicClient();
   const { data: crossChainData, isError } = useIsCrossChainDispute(disputeID, arbitrableAddress);
-  const isEnabled = !isUndefined(disputeID) && !isUndefined(crossChainData) && !isUndefined(arbitrableAddress);
   const { graphqlBatcher } = useGraphqlBatcher();
   const { data: externalDisputeID } = useEvidenceGroup(disputeID, arbitrableAddress);
+  const isEnabled =
+    !isUndefined(disputeID) &&
+    !isUndefined(crossChainData) &&
+    !isUndefined(arbitrableAddress) &&
+    !isUndefined(externalDisputeID);
 
   return useQuery<DisputeDetails>({
-    queryKey: [`DisputeTemplate${disputeID}${arbitrableAddress}`],
+    queryKey: [`DisputeTemplate${disputeID}${arbitrableAddress}${externalDisputeID}`],
     enabled: isEnabled,
     staleTime: Infinity,
     queryFn: async () => {