From 50ae852359042d5778df7676ed56f07e51decbc4 Mon Sep 17 00:00:00 2001
From: Don Mosites <mosites@gmail.com>
Date: Wed, 31 Jul 2024 10:39:58 +0200
Subject: [PATCH 1/2] update otc for v4 compatibility

---
 src/features/orders/ordersActions.ts          | 13 +++++++
 src/features/orders/ordersHelpers.ts          | 34 +++++++++++--------
 .../hooks/useLatestSwapFromEvents.ts          |  6 ++++
 src/helpers/createSwapSignature.ts            |  5 ++-
 4 files changed, 43 insertions(+), 15 deletions(-)

diff --git a/src/features/orders/ordersActions.ts b/src/features/orders/ordersActions.ts
index 9e06f6a7..908e15d7 100644
--- a/src/features/orders/ordersActions.ts
+++ b/src/features/orders/ordersActions.ts
@@ -277,6 +277,19 @@ export const approve =
         approveAmount
       );
 
+      if (isAppError(tx)) {
+        const appError = tx;
+        dispatch(setErrors([appError]));
+
+        if (appError.error && "message" in appError.error) {
+          dispatch(declineTransaction(appError.error.message));
+        }
+
+        dispatch(setStatus("failed"));
+
+        return;
+      }
+
       if (!tx.hash) {
         console.error("Approval transaction hash is missing.");
 
diff --git a/src/features/orders/ordersHelpers.ts b/src/features/orders/ordersHelpers.ts
index 54fa63b3..20cea07c 100644
--- a/src/features/orders/ordersHelpers.ts
+++ b/src/features/orders/ordersHelpers.ts
@@ -98,19 +98,25 @@ export async function approveToken(
   provider: ethers.providers.Web3Provider,
   contractType: "Swap" | "Wrapper",
   amount: string | number
-) {
-  const spender =
-    contractType === "Swap"
-      ? getSwapErc20Address(provider.network.chainId)
-      : Wrapper.getAddress(provider.network.chainId);
-  const erc20Contract = new ethers.Contract(
-    baseToken,
-    erc20Interface,
-    // @ts-ignore
-    provider.getSigner()
-  );
-  const approvalTxHash = await erc20Contract.approve(spender, amount);
-  return approvalTxHash as any as Transaction;
+): Promise<Transaction | AppError> {
+  return new Promise<Transaction | AppError>(async (resolve) => {
+    try {
+      const spender =
+        contractType === "Swap"
+          ? getSwapErc20Address(provider.network.chainId)
+          : Wrapper.getAddress(provider.network.chainId);
+      const erc20Contract = new ethers.Contract(
+        baseToken,
+        erc20Interface,
+        // @ts-ignore
+        provider.getSigner()
+      );
+      const approvalTxHash = erc20Contract.approve(spender, amount);
+      resolve(approvalTxHash);
+    } catch (error: any) {
+      resolve(transformUnknownErrorToAppError(error));
+    }
+  });
 }
 
 export async function takeOrder(
@@ -203,7 +209,7 @@ export async function check(
   provider: ethers.providers.Web3Provider,
   isSwapWithWrap?: boolean
 ): Promise<AppError[]> {
-  const strings = await (
+  const [count, strings] = await (
     await getSwapErc20Contract(provider, chainId)
   ).check(senderWallet, ...orderERC20ToParams(order));
 
diff --git a/src/features/transactions/hooks/useLatestSwapFromEvents.ts b/src/features/transactions/hooks/useLatestSwapFromEvents.ts
index fbd3c3d4..fc7f27ad 100644
--- a/src/features/transactions/hooks/useLatestSwapFromEvents.ts
+++ b/src/features/transactions/hooks/useLatestSwapFromEvents.ts
@@ -34,6 +34,12 @@ const useLatestSwapFromEvents = (
       const handleSwapEvent = async (
         nonce: BigNumber,
         signerAddress: string,
+        a: string,
+        b: number,
+        c: number,
+        d: string,
+        e: string,
+        f: number,
         swapEvent: Event
       ) => {
         const receipt = await swapEvent.getTransactionReceipt();
diff --git a/src/helpers/createSwapSignature.ts b/src/helpers/createSwapSignature.ts
index c533385b..3823195b 100644
--- a/src/helpers/createSwapSignature.ts
+++ b/src/helpers/createSwapSignature.ts
@@ -8,6 +8,8 @@ import { JsonRpcSigner } from "@ethersproject/providers/src.ts/json-rpc-provider
 import { AppError } from "../errors/appError";
 import transformUnknownErrorToAppError from "../errors/transformUnknownErrorToAppError";
 
+const SWAP_ERC20_VERSION = "4";
+
 export const createOrderERC20Signature = (
   unsignedOrder: UnsignedOrderERC20,
   signer: JsonRpcSigner,
@@ -21,7 +23,8 @@ export const createOrderERC20Signature = (
         // @ts-ignore
         signer,
         swapContract,
-        chainId
+        chainId,
+        SWAP_ERC20_VERSION
       );
       resolve(signature);
     } catch (error: unknown) {

From bf28ede2299a06fc025007f917c7d9a8bc74bc89 Mon Sep 17 00:00:00 2001
From: Don Mosites <mosites@gmail.com>
Date: Thu, 1 Aug 2024 08:45:35 +0200
Subject: [PATCH 2/2] change suggestion

---
 src/features/orders/ordersActions.ts | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/features/orders/ordersActions.ts b/src/features/orders/ordersActions.ts
index 908e15d7..ead3129d 100644
--- a/src/features/orders/ordersActions.ts
+++ b/src/features/orders/ordersActions.ts
@@ -278,15 +278,8 @@ export const approve =
       );
 
       if (isAppError(tx)) {
-        const appError = tx;
-        dispatch(setErrors([appError]));
-
-        if (appError.error && "message" in appError.error) {
-          dispatch(declineTransaction(appError.error.message));
-        }
-
         dispatch(setStatus("failed"));
-
+        handleOrderError(dispatch, tx);
         return;
       }