diff --git a/src/Components/BalanceDetails/BalanceDetails.jsx b/src/Components/BalanceDetails/BalanceDetails.jsx
index 60e62b60..08eecaa3 100644
--- a/src/Components/BalanceDetails/BalanceDetails.jsx
+++ b/src/Components/BalanceDetails/BalanceDetails.jsx
@@ -399,15 +399,15 @@ function BalanceDetails({ mt0 }) {
{
value: NETWORK.TEST_NETWORK,
label: {NETWORK.TEST_NETWORK}
- },
- {
- value: NETWORK.UAT,
- label: {NETWORK.UAT}
- },
- {
- value: NETWORK.QA_NETWORK,
- label: {NETWORK.QA_NETWORK}
}
+ // {
+ // value: NETWORK.UAT,
+ // label: {NETWORK.UAT}
+ // },
+ // {
+ // value: NETWORK.QA_NETWORK,
+ // label: {NETWORK.QA_NETWORK}
+ // }
]}
/>
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("");
diff --git a/src/Scripts/initbackground.js b/src/Scripts/initbackground.js
index 1e74f70a..c7d62add 100644
--- a/src/Scripts/initbackground.js
+++ b/src/Scripts/initbackground.js
@@ -2196,7 +2196,7 @@ export class GeneralWalletRPC {
const tx = {
to: toAddress,
from: account.evmAddress,
- value: amount
+ value: Number(amount) * DECIMALS
};
if (data?.data) {
diff --git a/src/manifest/firefox.json b/src/manifest/firefox.json
index 42288d0b..31e5579f 100644
--- a/src/manifest/firefox.json
+++ b/src/manifest/firefox.json
@@ -23,19 +23,12 @@
"
"
],
"background": {
- "scripts": [
- "./static/js/background.js"
- ]
+ "scripts": ["./static/js/background.js"]
},
"content_scripts": [
{
- "matches": [
- "http://*/*",
- "https://*/*"
- ],
- "js": [
- "./static/js/content.js"
- ],
+ "matches": ["http://*/*", "https://*/*"],
+ "js": ["./static/js/content.js"],
"all_frames": false,
"run_at": "document_end"
}
@@ -50,4 +43,4 @@
}
},
"content_security_policy": "script-src 'self' 'wasm-unsafe-eval'; object-src 'self'; frame-ancestors 'none';"
-}
\ No newline at end of file
+}