fixed orderSchema for protocolFee and jsonDisplayData for protocolFee

airswap · May 10, 2024 · 668ec11 · 668ec11
1 parent 5cb0f9e
commit 668ec11
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 18 deletions.
diff --git a/src/App.tsx b/src/App.tsx
@@ -85,6 +85,7 @@ function App() {
   let senderWallet;
   let senderToken;
   let senderAmount;
+  let userProtocolFee;
 
   const validSchema = schemaValidationResult.success;
 
@@ -97,6 +98,7 @@ function App() {
     senderWallet = order?.senderWallet;
     senderToken = order?.senderToken;
     senderAmount = order?.senderAmount;
+    userProtocolFee = order?.protocolFee;
   }
 
   const handleTextChange = (e: ChangeEvent<HTMLTextAreaElement>) => {
@@ -141,6 +143,7 @@ function App() {
             protocolFeeFormatted={
               Number(protocolFeeFromJson) || protocolFeeFormatted
             }
+            userProtocolFee={userProtocolFee}
             nonce={nonce}
             expiry={expiry}
             signerWallet={signerWallet}

diff --git a/src/features/ui/jsonDataDisplay.tsx b/src/features/ui/jsonDataDisplay.tsx
@@ -11,6 +11,7 @@ export const JsonDataDisplay = ({
   domainName,
   domainVersion,
   protocolFeeFormatted,
+  userProtocolFee,
   nonce,
   expiry,
   signerWallet,
@@ -26,6 +27,7 @@ export const JsonDataDisplay = ({
   domainName: string | undefined;
   domainVersion: string | undefined;
   protocolFeeFormatted: number | undefined;
+  userProtocolFee?: string | undefined;
   nonce: number | undefined;
   expiry: number | undefined;
   signerWallet: string | undefined;
@@ -91,6 +93,14 @@ export const JsonDataDisplay = ({
           </div>
           <div className="text-textDark font-medium">signerAmount</div>
           <div>{signerAmountFormatted}</div>
+
+          {userProtocolFee && (
+            <>
+              <div className="text-textDark font-medium">protocolFee</div>
+              <div>{userProtocolFee}</div>
+            </>
+          )}
+
           <div className="text-textDark font-medium">senderWallet</div>
           <div>
             <ExplorerUrl jsonData={senderWallet} />

diff --git a/src/hooks/useSetChainId.ts b/src/hooks/useSetChainId.ts
@@ -7,23 +7,6 @@ type Order =
       [x: string]: any;
     }
   | undefined;
-// | {
-//     nonce: number;
-//     signerWallet: string;
-//     senderWallet: string | null;
-//     expiry: number;
-//     signerToken: string;
-//     signerAmount: string;
-//     senderToken: string;
-//     senderAmount: string;
-//     v: number;
-//     r: string;
-//     s: string;
-//     chainId?: number | undefined;
-//     swapContract?: string | undefined;
-//     protocolFee?: number | undefined;
-//   }
-// | undefined;
 
 export const useSetChainId = ({
   order,

diff --git a/src/hooks/useValidateOrder.ts b/src/hooks/useValidateOrder.ts
@@ -25,6 +25,7 @@ export const useValidateOrder = ({
     }
   }
 
+  console.log(_order);
   // Check if the parsed order is valid.
   const schemaWithExpectedFee = signedOrderSchema(protocolFee);
 

diff --git a/src/utils/orderSchema.ts b/src/utils/orderSchema.ts
@@ -24,7 +24,8 @@ export const signedOrderSchema = (expectedProtocolFee?: number | undefined) => {
   if (expectedProtocolFee) {
     schemaConfig.protocolFee = z.coerce
       .number()
-      .pipe(z.literal(expectedProtocolFee).optional());
+      .pipe(z.literal(expectedProtocolFee))
+      .optional();
   }
 
   return z.object(schemaConfig);
-Original file line number
+Diff line change
@@ Expand Up / @@ -25,6 +25,7 @@ export const useValidateOrder = ({ @@
         }
       }
+      console.log(_order);
       // Check if the parsed order is valid.
       const schemaWithExpectedFee = signedOrderSchema(protocolFee);
@@ Expand Down @@