From 6c1847dc7aa88f983c1edd89133ca985fed969d1 Mon Sep 17 00:00:00 2001
From: NiftyAndy <andy@niftyleague.com>
Date: Wed, 19 Jun 2024 22:50:32 -0400
Subject: [PATCH] Fix BalanceManager withdrawal issue

---
 .../dashboard/overview/_MyNFTL/RefreshBalanceForm.tsx      | 7 +++----
 apps/app/src/app/(public-routes)/raffle/MyNFTL.tsx         | 5 ++---
 apps/app/src/constants/contracts/deployments.mainnet.ts    | 5 +++++
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/apps/app/src/app/(private-routes)/dashboard/overview/_MyNFTL/RefreshBalanceForm.tsx b/apps/app/src/app/(private-routes)/dashboard/overview/_MyNFTL/RefreshBalanceForm.tsx
index c8bfe9f5..53f87616 100644
--- a/apps/app/src/app/(private-routes)/dashboard/overview/_MyNFTL/RefreshBalanceForm.tsx
+++ b/apps/app/src/app/(private-routes)/dashboard/overview/_MyNFTL/RefreshBalanceForm.tsx
@@ -74,10 +74,9 @@ const HistoryTable = ({
 
   const handleRetryWithdraw = async (data: { amount: number; expire_at: number; signature: string }) => {
     const { amount, expire_at, signature } = data;
-    const res = await tx(
-      writeContracts[GAME_ACCOUNT_CONTRACT].withdraw(parseEther(`${amount}`), BigInt(nonce), expire_at, signature),
-    );
-    if (res) resetForm();
+    const contract = writeContracts[GAME_ACCOUNT_CONTRACT];
+    await tx(contract.withdraw(parseEther(`${amount}`), nonce, expire_at, signature));
+    resetForm();
   };
 
   return (
diff --git a/apps/app/src/app/(public-routes)/raffle/MyNFTL.tsx b/apps/app/src/app/(public-routes)/raffle/MyNFTL.tsx
index e61b1c2d..7293d45c 100644
--- a/apps/app/src/app/(public-routes)/raffle/MyNFTL.tsx
+++ b/apps/app/src/app/(public-routes)/raffle/MyNFTL.tsx
@@ -85,9 +85,8 @@ const MyNFTL = (): JSX.Element => {
           signature: string;
           nonce: number;
         };
-        const txRes = await tx(
-          writeContracts[GAME_ACCOUNT_CONTRACT].withdraw(amountWEI, BigInt(nonce), expire_at, signature),
-        );
+        const contract = writeContracts[GAME_ACCOUNT_CONTRACT];
+        const txRes = await tx(contract.withdraw(amountWEI, nonce, expire_at, signature));
         // eslint-disable-next-line no-console
         if (DEBUG) console.log('TX_DATA', txRes);
         refreshNFTLBalance();
diff --git a/apps/app/src/constants/contracts/deployments.mainnet.ts b/apps/app/src/constants/contracts/deployments.mainnet.ts
index 57dc6ac4..94fd3e1c 100644
--- a/apps/app/src/constants/contracts/deployments.mainnet.ts
+++ b/apps/app/src/constants/contracts/deployments.mainnet.ts
@@ -490,6 +490,11 @@ export default {
               name: '_nonce',
               type: 'uint256',
             },
+            {
+              internalType: 'uint256',
+              name: '_expireAt',
+              type: 'uint256',
+            },
             {
               internalType: 'bytes',
               name: '_signature',