Merge pull request #1867 from kleros/fix/separate-batchers

fix(Web): separate-batchers

Author: alcercu

web/src/context/GraphqlBatcher.tsx

@@ -22,11 +22,11 @@ interface IQuery {
 
 const Context = createContext<IGraphqlBatcher | undefined>(undefined);
 
-const executor: AsyncExecutor = async ({ document, variables, extensions }) => {
+const fetch = async (url, document, variables) => {
   try {
     // eslint-disable-next-line @typescript-eslint/ban-ts-comment
     //@ts-ignore
-    const result = request(extensions.url, document, variables).then((res) => ({
+    const result = request(url, document, variables).then((res) => ({
       data: res,
     })) as Promise<ExecutionResult>;
 
@@ -38,12 +38,29 @@ const executor: AsyncExecutor = async ({ document, variables, extensions }) => {
   }
 };
 
-const batchExec = createBatchingExecutor(executor);
+const coreExecutor: AsyncExecutor = async ({ document, variables }) => {
+  return fetch(getGraphqlUrl(false), document, variables);
+};
+
+const dtrExecutor: AsyncExecutor = async ({ document, variables }) => {
+  return fetch(getGraphqlUrl(true), document, variables);
+};
+
+const coreBatchExec = createBatchingExecutor(coreExecutor);
+const dtrBatchExec = createBatchingExecutor(dtrExecutor);
 
 const fetcher = async (queries: IQuery[]) => {
   const batchdata = await Promise.all(
-    queries.map(({ document, variables, isDisputeTemplate, chainId }) =>
-      batchExec({ document, variables, extensions: { url: getGraphqlUrl(isDisputeTemplate ?? false, chainId) } })
+    queries.map(({ document, variables, isDisputeTemplate }) =>
+      isDisputeTemplate
+        ? dtrBatchExec({
+            document,
+            variables,
+          })
+        : coreBatchExec({
+            document,
+            variables,
+          })
     )
   );