From 57ce190e2002df458d9e00a3a83703512f4ca77f Mon Sep 17 00:00:00 2001
From: Frontier <103474701+frontier159@users.noreply.github.com>
Date: Mon, 6 Nov 2023 15:37:03 +0800
Subject: [PATCH] Merge fix (#888)

* fix: addliquidity calculation (#728) (#729)

* updated early withdraw vault

* chore: merge fix from main

---------

Co-authored-by: Nicho <nichosystem@protonmail.com>
Co-authored-by: jebsley3 <96315255+jebsley3@users.noreply.github.com>
Co-authored-by: Marshall <99344331+marshall2112@users.noreply.github.com>
---
 apps/dapp/src/components/Pages/Core/NewUI/ClaimModal.tsx | 9 +++++----
 apps/dapp/src/constants/env/production.tsx               | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/apps/dapp/src/components/Pages/Core/NewUI/ClaimModal.tsx b/apps/dapp/src/components/Pages/Core/NewUI/ClaimModal.tsx
index 25b5d7fb0..8f4ca7af0 100644
--- a/apps/dapp/src/components/Pages/Core/NewUI/ClaimModal.tsx
+++ b/apps/dapp/src/components/Pages/Core/NewUI/ClaimModal.tsx
@@ -9,6 +9,7 @@ import { BigNumber } from 'ethers';
 import { useWithdrawFromVault } from 'hooks/core/use-withdraw-from-vault';
 import { VaultButton } from '../VaultPages/VaultContent';
 import { useTokenContractAllowance } from 'hooks/core/use-token-contract-allowance';
+import { getBigNumberFromString } from 'components/Vault/utils';
 import env from 'constants/env';
 import _ from 'lodash';
 
@@ -22,6 +23,9 @@ const EMPTY_CLAIM_STATE = {
   claimAmount: '',
 };
 
+// The early withdrawal vault minimum withdrawal amount
+const MIN_WITHDRAWAL_AMOUNT = BigNumber.from(1_000);
+
 export const ClaimModal: React.FC<IProps> = ({ isOpen, onClose }) => {
   const {
     balances: { balances, isLoading: balancesIsLoading },
@@ -109,13 +113,10 @@ export const ClaimModal: React.FC<IProps> = ({ isOpen, onClose }) => {
             <ErrorLabel>{formatErrorMessage(earlyWithdrawError.message) || 'Something went wrong'}</ErrorLabel>
           )}
 
-          {Number(claimState.claimAmount) === 0 ? (
+          {getBigNumberFromString(claimState.claimAmount).lt(MIN_WITHDRAWAL_AMOUNT) ? (
             <ClaimButton
               label={`Nothing to Claim`}
               disabled={true}
-              onClick={async () => {
-                await earlyWithdraw(claimState.claimSubvaultAddress, claimState.claimAmount);
-              }}
             />
           ) : earlyWithdrawAllowance === 0 ? (
             <ClaimButton
diff --git a/apps/dapp/src/constants/env/production.tsx b/apps/dapp/src/constants/env/production.tsx
index 551227b7b..2a3c34e40 100644
--- a/apps/dapp/src/constants/env/production.tsx
+++ b/apps/dapp/src/constants/env/production.tsx
@@ -57,7 +57,7 @@ const env: Environment = {
     treasuryIv: '0xae8a796bd9437Bd266664e8e9B8428B25A7D2477',
     vaultOps: '0x65fE8BaBF7DA367b2B45cBD748F0490713f84828',
     vaultProxy: '0x6f5bB7cC4F3D6628d0095545552757AB377FE15C',
-    vaultEarlyExit: '0x7C6f1b4891ff8CAcCeC97DbbD9Df3b773d88A03E',
+    vaultEarlyExit: '0x24719d3AF60e1B622a29317d29E5Ce283617DeEC',
     ramos: '0xDdF499e726Bfde29Ce035F6B355e55757F08B5EF',
     ramosStrategy: '0xDA5CeF575eaEF14032C5006eb5cbEbE7eE0E347b',
     ramosPoolHelper: '0xe32089bf9724aF09C026BeC36a7d8a81500cd58A',