fix: gas estimate for contract (#22)

Signed-off-by: kulwindersingh-ant <[email protected]>
5ire-tech · May 15, 2024 · 3a7ec0c · 3a7ec0c
1 parent 923d924
commit 3a7ec0c
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 34 deletions.
diff --git a/src/Components/BalanceDetails/BalanceDetails.jsx b/src/Components/BalanceDetails/BalanceDetails.jsx
@@ -399,15 +399,15 @@ function BalanceDetails({ mt0 }) {
                     {
                       value: NETWORK.TEST_NETWORK,
                       label: <span className="flexedItemSelect">{NETWORK.TEST_NETWORK}</span>
-                    },
-                    {
-                      value: NETWORK.UAT,
-                      label: <span className="flexedItemSelect">{NETWORK.UAT}</span>
-                    },
-                    {
-                      value: NETWORK.QA_NETWORK,
-                      label: <span className="flexedItemSelect">{NETWORK.QA_NETWORK}</span>
                     }
+                    // {
+                    //   value: NETWORK.UAT,
+                    //   label: <span className="flexedItemSelect">{NETWORK.UAT}</span>
+                    // },
+                    // {
+                    //   value: NETWORK.QA_NETWORK,
+                    //   label: <span className="flexedItemSelect">{NETWORK.QA_NETWORK}</span>
+                    // }
                   ]}
                 />
               </div>

diff --git 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() {
             <button
               onClick={activeSend}
               name={EVM}
-              className={`${style.sendSec__sendSwapbtn__buttons}  ${activeTab === EVM && style.sendSec__sendSwapbtn__buttons__active
-                }`}>
+              className={`${style.sendSec__sendSwapbtn__buttons}  ${
+                activeTab === EVM && style.sendSec__sendSwapbtn__buttons__active
+              }`}>
               EVM
             </button>
             <div
-              className={`${activeTab === NATIVE && style.activeFirst} ${activeTab === EVM && style.activeSecond
-                } ${style.animations}`}></div>
+              className={`${activeTab === NATIVE && style.activeFirst} ${
+                activeTab === EVM && style.activeSecond
+              } ${style.animations}`}></div>
           </div>
         </div>
         <div className={style.sendSec__inputInnerSec}>

diff --git 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,15 +167,15 @@ 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("");
     } else if (toFrom.from.toLowerCase() === NATIVE.toLowerCase()) {
       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
@@ -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
@@ -23,19 +23,12 @@
     "<all_urls>"
   ],
   "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';"
-}
+}