From 5dd589066dc956f96ff5ca31beb76f3c6e993fdd Mon Sep 17 00:00:00 2001
From: abefernan <44572727+abefernan@users.noreply.github.com>
Date: Wed, 26 Jul 2023 09:42:05 +0200
Subject: [PATCH] Remove intermediate data field

---
 pages/[chainName]/[address]/transaction/[transactionID].tsx | 6 +++---
 .../api/chain/[chainId]/multisig/[multisigAddress]/index.ts | 6 +++---
 pages/api/chain/[chainId]/multisig/index.ts                 | 2 +-
 pages/api/transaction/[transactionID]/index.ts              | 2 +-
 pages/api/transaction/[transactionID]/signature.ts          | 2 +-
 pages/api/transaction/index.ts                              | 2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/pages/[chainName]/[address]/transaction/[transactionID].tsx b/pages/[chainName]/[address]/transaction/[transactionID].tsx
index 459f872..a1de65c 100644
--- a/pages/[chainName]/[address]/transaction/[transactionID].tsx
+++ b/pages/[chainName]/[address]/transaction/[transactionID].tsx
@@ -39,9 +39,9 @@ export const getServerSideProps: GetServerSideProps = async (context): Promise<P
     console.log("Function `findTransactionByID` invoked", transactionID);
     const getRes = await findTransactionByID(transactionID);
     console.log("success", getRes.data);
-    txHash = getRes.data.data.findTransactionByID.txHash;
-    transactionJSON = getRes.data.data.findTransactionByID.dataJSON;
-    signatures = getRes.data.data.findTransactionByID.signatures.data || [];
+    txHash = getRes.data.findTransactionByID.txHash;
+    transactionJSON = getRes.data.findTransactionByID.dataJSON;
+    signatures = getRes.data.findTransactionByID.signatures.data || [];
   } catch (err: unknown) {
     console.log(err);
   }
diff --git a/pages/api/chain/[chainId]/multisig/[multisigAddress]/index.ts b/pages/api/chain/[chainId]/multisig/[multisigAddress]/index.ts
index d6240e3..fb1bb76 100644
--- a/pages/api/chain/[chainId]/multisig/[multisigAddress]/index.ts
+++ b/pages/api/chain/[chainId]/multisig/[multisigAddress]/index.ts
@@ -9,12 +9,12 @@ export default async function multisigAddressApi(req: NextApiRequest, res: NextA
         const chainId = req.query.chainId?.toString() || "";
         console.log("Function `getMultisig` invoked", multisigAddress, chainId);
         const getRes = await getMultisig(multisigAddress, chainId);
-        if (!getRes.data.data.getMultisig) {
+        if (!getRes.data.getMultisig) {
           res.status(404).send("Multisig not found");
           return;
         }
-        console.log("success", getRes.data.data.getMultisig);
-        res.status(200).send(getRes.data.data.getMultisig);
+        console.log("success", getRes.data.getMultisig);
+        res.status(200).send(getRes.data.getMultisig);
         return;
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
       } catch (err: any) {
diff --git a/pages/api/chain/[chainId]/multisig/index.ts b/pages/api/chain/[chainId]/multisig/index.ts
index 11ff869..3121cde 100644
--- a/pages/api/chain/[chainId]/multisig/index.ts
+++ b/pages/api/chain/[chainId]/multisig/index.ts
@@ -9,7 +9,7 @@ export default async function multisigApi(req: NextApiRequest, res: NextApiRespo
         console.log("Function `createMultisig` invoked", data);
         const saveRes = await createMultisig(data);
         console.log("success", saveRes.data);
-        res.status(200).send(saveRes.data.data.createMultisig);
+        res.status(200).send(saveRes.data.createMultisig);
         return;
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
       } catch (err: any) {
diff --git a/pages/api/transaction/[transactionID]/index.ts b/pages/api/transaction/[transactionID]/index.ts
index e77729c..0c077c8 100644
--- a/pages/api/transaction/[transactionID]/index.ts
+++ b/pages/api/transaction/[transactionID]/index.ts
@@ -10,7 +10,7 @@ export default async function transactionIDApi(req: NextApiRequest, res: NextApi
         console.log("Function `updateTransaction` invoked", txHash);
         const saveRes = await updateTxHash(transactionID, txHash);
         console.log("success", saveRes.data);
-        res.status(200).send(saveRes.data.data.updateTransaction);
+        res.status(200).send(saveRes.data.updateTransaction);
         return;
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
       } catch (err: any) {
diff --git a/pages/api/transaction/[transactionID]/signature.ts b/pages/api/transaction/[transactionID]/signature.ts
index b2b55ee..e9919d6 100644
--- a/pages/api/transaction/[transactionID]/signature.ts
+++ b/pages/api/transaction/[transactionID]/signature.ts
@@ -10,7 +10,7 @@ export default async function transactionIDApi(req: NextApiRequest, res: NextApi
         console.log("Function `createSignature` invoked", data);
         const saveRes = await createSignature(data, transactionID);
         console.log("success", saveRes.data);
-        res.status(200).send(saveRes.data.data.createSignature);
+        res.status(200).send(saveRes.data.createSignature);
         return;
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
       } catch (err: any) {
diff --git a/pages/api/transaction/index.ts b/pages/api/transaction/index.ts
index 3aad3e2..51a828a 100644
--- a/pages/api/transaction/index.ts
+++ b/pages/api/transaction/index.ts
@@ -9,7 +9,7 @@ export default async function transactionApi(req: NextApiRequest, res: NextApiRe
         console.log("Function `createTransaction` invoked", data);
         const saveRes = await createTransaction(data.dataJSON);
         console.log("success", saveRes.data);
-        res.status(200).send({ transactionID: saveRes.data.data.createTransaction._id });
+        res.status(200).send({ transactionID: saveRes.data.createTransaction._id });
         return;
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
       } catch (err: any) {