From ce7be17cbd60188b53d4e24d3d60d66149fd1fff Mon Sep 17 00:00:00 2001 From: kulwindersingh-ant Date: Sat, 11 May 2024 21:54:11 +0530 Subject: [PATCH] fix: adds extra Signed-off-by: kulwindersingh-ant --- src/Constants/index.js | 2 +- src/Pages/Send/Send.jsx | 20 +++++++++++--------- src/Pages/Swap/Swap.jsx | 10 +++++----- 3 files changed, 17 insertions(+), 15 deletions(-) diff --git a/src/Constants/index.js b/src/Constants/index.js index 8a8049a4..6fd7969e 100644 --- a/src/Constants/index.js +++ b/src/Constants/index.js @@ -12,7 +12,7 @@ export const PORT_NAME = "WEBEXT_REDUX_TEST"; export const UI_CONNECTION_NAME = "5IRE_EXT_UI"; export const RESTRICTED_FOR_CONTENT_SCRIPT = "chrome-extension://"; -export const EXTRA_FEE = 0; +export const EXTRA_FEE = 0.0001; export const WINDOW_WIDTH = 400; export const DECIMALS = 10 ** 18; export const WINDOW_HEIGHT = 620; diff --git a/src/Pages/Send/Send.jsx b/src/Pages/Send/Send.jsx index fdf0d979..8755363f 100644 --- a/src/Pages/Send/Send.jsx +++ b/src/Pages/Send/Send.jsx @@ -115,7 +115,7 @@ function Send() { if ( Number(data.amount) + Number(estimatedGas) + (isEd ? edValue : 0) > Number(balance?.evmBalance) - - pendingTransactionBalance[currentAccount.evmAddress][currentNetwork.toLowerCase()].evm + pendingTransactionBalance[currentAccount.evmAddress][currentNetwork.toLowerCase()].evm ) { updateEstimatedGas(null); setErr((p) => ({ @@ -145,8 +145,8 @@ function Send() { } else if ( Number(data.amount) + Number(estimatedGas) + (isEd ? edValue : 0) > Number(balance?.nativeBalance) - - pendingTransactionBalance[currentAccount?.evmAddress][currentNetwork.toLowerCase()] - .native + pendingTransactionBalance[currentAccount?.evmAddress][currentNetwork.toLowerCase()] + .native ) { updateEstimatedGas(null); setErr((p) => ({ ...p, amount: ERROR_MESSAGES.INSUFFICENT_BALANCE })); @@ -192,7 +192,7 @@ function Send() { else if ( Number(data.amount) >= Number(balance?.evmBalance) - - pendingTransactionBalance[currentAccount?.evmAddress][currentNetwork.toLowerCase()].evm + pendingTransactionBalance[currentAccount?.evmAddress][currentNetwork.toLowerCase()].evm ) setErr((p) => ({ ...p, amount: ERROR_MESSAGES.INSUFFICENT_BALANCE })); else setErr((p) => ({ ...p, amount: "" })); @@ -202,7 +202,7 @@ function Send() { else if ( Number(data.amount) >= Number(balance?.nativeBalance) - - pendingTransactionBalance[currentAccount?.evmAddress][currentNetwork.toLowerCase()].native + pendingTransactionBalance[currentAccount?.evmAddress][currentNetwork.toLowerCase()].native ) setErr((p) => ({ ...p, amount: ERROR_MESSAGES.INSUFFICENT_BALANCE })); else setErr((p) => ({ ...p, amount: "" })); @@ -434,13 +434,15 @@ function Send() {
+ className={`${activeTab === NATIVE && style.activeFirst} ${ + activeTab === EVM && style.activeSecond + } ${style.animations}`}>
diff --git a/src/Pages/Swap/Swap.jsx b/src/Pages/Swap/Swap.jsx index fc937f4e..68b14466 100644 --- a/src/Pages/Swap/Swap.jsx +++ b/src/Pages/Swap/Swap.jsx @@ -108,7 +108,7 @@ function Swap() { } else if ( Number(amount) + Number(estimatedGas) + (isEd ? edValue : 0) > Number(balance?.evmBalance) - - pendingTransactionBalance[currentAccount.evmAddress][currentNetwork.toLowerCase()].evm + pendingTransactionBalance[currentAccount.evmAddress][currentNetwork.toLowerCase()].evm ) { setDisable(true); updateEstimatedGas(null); @@ -138,8 +138,8 @@ function Swap() { if ( Number(amount) + Number(estimatedGas) + (isEd ? edValue : 0) > Number(balance?.nativeBalance) - - pendingTransactionBalance[currentAccount.evmAddress][currentNetwork.toLowerCase()] - .native + pendingTransactionBalance[currentAccount.evmAddress][currentNetwork.toLowerCase()] + .native ) { setDisable(true); updateEstimatedGas(null); @@ -167,7 +167,7 @@ function Swap() { if ( Number(amount) >= Number(balance?.evmBalance) - - pendingTransactionBalance[currentAccount.evmAddress][currentNetwork.toLowerCase()].evm + pendingTransactionBalance[currentAccount.evmAddress][currentNetwork.toLowerCase()].evm ) setError(ERROR_MESSAGES.INSUFFICENT_BALANCE); else setError(""); @@ -175,7 +175,7 @@ function Swap() { if ( Number(amount) >= Number(balance?.nativeBalance) - - pendingTransactionBalance[currentAccount.evmAddress][currentNetwork.toLowerCase()].native + pendingTransactionBalance[currentAccount.evmAddress][currentNetwork.toLowerCase()].native ) setError(ERROR_MESSAGES.INSUFFICENT_BALANCE); else setError("");