From d7a6c291bd96db28de0565228d8467c82393e5f0 Mon Sep 17 00:00:00 2001
From: Justin Lee <justin.lee@coinbase.com>
Date: Thu, 3 Oct 2024 14:27:39 -0500
Subject: [PATCH] rename message field to typedData

---
 src/helpers/formatTxMessageResponse.ts | 6 +++---
 src/pages/api/submitPaymentTx/index.ts | 6 +++---
 src/types/paymentTx.ts                 | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/helpers/formatTxMessageResponse.ts b/src/helpers/formatTxMessageResponse.ts
index bdd6136..b25ee3a 100644
--- a/src/helpers/formatTxMessageResponse.ts
+++ b/src/helpers/formatTxMessageResponse.ts
@@ -11,10 +11,10 @@ export function formatTxMessageResponse({ txMessage, senderAddress }: Props) {
     ...txMessage,
     rpcProxySubmissionParams: {
       ...txMessage.rpcProxySubmissionParams,
-      message: {
-        ...txMessage.rpcProxySubmissionParams.message,
+      typedData: {
+        ...txMessage.rpcProxySubmissionParams.typedData,
         message: {
-          ...txMessage.rpcProxySubmissionParams.message.message,
+          ...txMessage.rpcProxySubmissionParams.typedData.message,
           from: senderAddress,
         }
       },
diff --git a/src/pages/api/submitPaymentTx/index.ts b/src/pages/api/submitPaymentTx/index.ts
index 2db1d9b..cd4e984 100644
--- a/src/pages/api/submitPaymentTx/index.ts
+++ b/src/pages/api/submitPaymentTx/index.ts
@@ -25,9 +25,9 @@ export default async function handler(
     return res.status(500);
   }
 
-  const { message, signature, uuid, txHash } = req.body;
-  const { from, to, value, nonce, validAfter, validBefore } = message.message;
-  const { chainId } = message.domain;
+  const { typedData, signature, uuid, txHash } = req.body;
+  const { from, to, value, nonce, validAfter, validBefore } = typedData.message;
+  const { chainId } = typedData.domain;
 
   const sponsoredInfo = sponsoredUsdcMapping.find((s) => s.chainId === Number(chainId));
   if (!sponsoredInfo) {
diff --git a/src/types/paymentTx.ts b/src/types/paymentTx.ts
index e0120c7..8745ed5 100644
--- a/src/types/paymentTx.ts
+++ b/src/types/paymentTx.ts
@@ -49,5 +49,5 @@ export function isContractCallPayload(payload: Payload): payload is ContractCall
 }
 
 export function isEip712Payload(payload: Payload): payload is Eip712Payload {
-  return payload.payloadType === 'eip712' && 'rpcProxySubmissionParams' in payload && 'message' in payload.rpcProxySubmissionParams;
+  return payload.payloadType === 'eip712' && 'rpcProxySubmissionParams' in payload && 'typedData' in payload.rpcProxySubmissionParams;
 }