Fixes

package.json

@@ -15,7 +15,7 @@
     "build:chrome": "BROWSER_TARGET=CHROME vite build",
     "build:firefox": "BROWSER_TARGET=FIREFOX vite build",
     "build": "NODE_ENV=production tsc --noEmit && npm run build:chrome && npm run build:firefox",
-    "dev": "NODE_ENV=develop BROWSER_TARGET=CHROME nodemon",
+    "dev": "NODE_ENV=develop BROWSER_TARGET=CHROME vite build --watch",
     "dev:firefox": "NODE_ENV=develop BROWSER_TARGET=FIREFOX nodemon",
     "test": "vitest --reporter=verbose",
     "test:cov": "vitest  --reporter=verbose run --coverage",

src/pages/manageAssets/ManageAssets.test.tsx

@@ -26,11 +26,17 @@ describe("ManageAssets", () => {
         state: {
           selectedChain: CHAINS[0].chains[3],
           type: AccountType.EVM,
+          api: null
         },
       }),
       useThemeContext: () => ({
         color: "red",
       }),
+      useAccountContext: () => ({
+        state: {
+          selectedAccount: {}
+        }
+      })
     }));
 
     vi.mock("react-router-dom", () => ({

src/pages/manageAssets/ManageAssets.tsx

@@ -5,7 +5,7 @@ import { useNavigate } from "react-router-dom";
 import { useToast } from "@src/hooks";
 import Extension from "@src/Extension";
 import { BALANCE } from "@src/routes/paths";
-import { useAssetContext, useNetworkContext } from "@src/providers";
+import { useAccountContext, useAssetContext, useNetworkContext } from "@src/providers";
 import { number, object, string } from "yup";
 import { isHex, u8aToHex } from "@polkadot/util";
 import { useForm } from "react-hook-form";
@@ -29,8 +29,9 @@ export const ManageAssets = () => {
   const { t } = useTranslation("manage_assets");
   const { t: tCommon } = useTranslation("common");
   const {
-    state: { selectedChain, type },
+    state: { selectedChain, type, api },
   } = useNetworkContext();
+  const { state: { selectedAccount } } = useAccountContext()
   const { loadAssets } = useAssetContext();
 
   const navigate = useNavigate();
@@ -71,7 +72,11 @@ export const ManageAssets = () => {
   const onSubmit = handleSubmit(async (data) => {
     try {
       await Extension.addAsset(selectedChain.name, data);
-      loadAssets();
+      loadAssets({
+        api,
+        selectedChain,
+        selectedAccount
+      });
       navigate(BALANCE);
     } catch (error) {
       showErrorToast(error);

src/pages/send/Send.tsx

@@ -6,10 +6,7 @@ import { useAccountContext, useNetworkContext } from "@src/providers";
 import { yupResolver } from "@hookform/resolvers/yup";
 import { number, object, string } from "yup";
 import { useLoading, useToast } from "@src/hooks";
-import { decodeAddress, encodeAddress } from "@polkadot/keyring";
 import { useNavigate } from "react-router-dom";
-import { isHex } from "@polkadot/util";
-import { isAddress } from "ethers/lib/utils";
 import { AccountType } from "@src/accounts/types";
 import { ConfirmTx, WasmForm, EvmForm } from "./components";
 import { BALANCE } from "@src/routes/paths";
@@ -19,6 +16,7 @@ import { BigNumber, Contract } from "ethers";
 import { getWebAPI } from "@src/utils/env";
 import { XCM_MAPPING } from "@src/xcm/extrinsics";
 import { MapResponseEVM } from "@src/xcm/interfaces";
+import { isValidAddress } from "@src/utils/account-utils";
 
 const WebAPI = getWebAPI();
 
@@ -52,21 +50,7 @@ export const Send = () => {
         .test(
           "valid address",
           tCommon("invalid_address") as string,
-          (address) => {
-            try {
-              if (!address) return false;
-
-              if (isHex(address)) {
-                return isAddress(address);
-              } else {
-                encodeAddress(decodeAddress(address));
-              }
-
-              return true;
-            } catch (error) {
-              return false;
-            }
-          }
+          (address) => isValidAddress(address)
         )
         .required(t("required") as string),
       amount: number().required(t("required") as string),

src/pages/send/components/EvmForm.test.tsx

@@ -64,7 +64,7 @@ describe("EvmForm", () => {
 
           if (value === "to") {
             return {
-              address: "0x123",
+              address: "0xa0a58b72969DF1904Bf2315f2D041AD639737429",
             };
           }
 
@@ -88,7 +88,7 @@ describe("EvmForm", () => {
                 decimals: 18,
               };
             case "destinationAccount":
-              return "0x123";
+              return "0xa0a58b72969DF1904Bf2315f2D041AD639737429";
             default:
               return "";
           }
@@ -113,7 +113,9 @@ describe("EvmForm", () => {
           Wallet: class Wallet { },
           Contract: class Contract {
             estimateGas = {
-              transfer: vi.fn().mockReturnValue(BigNumber.from("21000")),
+              transfer: vi.fn().mockReturnValue(
+                Promise.resolve(BigNumber.from("21000"))
+              ),
             };
           },
         },
@@ -152,7 +154,7 @@ describe("EvmForm", () => {
 
         if (value === "to") {
           return {
-            address: "0x123",
+            address: "0xa0a58b72969DF1904Bf2315f2D041AD639737429",
           };
         }
 
@@ -177,7 +179,7 @@ describe("EvmForm", () => {
               balance: BigNumber.from("1000000000000000000"),
             };
           case "destinationAccount":
-            return "0x123";
+            return "0xa0a58b72969DF1904Bf2315f2D041AD639737429";
           default:
             return "";
         }
@@ -199,4 +201,8 @@ describe("EvmForm", () => {
     });
     expect(confirmTx).toHaveBeenCalled();
   });
+
+  it("should return error calculating gas fee", async () => {
+
+  })
 });

src/pages/send/components/EvmForm.tsx

@@ -20,6 +20,7 @@ import { captureError } from "@src/utils/error-handling";
 import { XCM_MAPPING } from "@src/xcm/extrinsics";
 import { MapResponseEVM } from "@src/xcm/interfaces";
 import { ShowBalance } from "./ShowBalance";
+import { isValidAddress } from "@src/utils/account-utils";
 
 interface EvmFormProps {
   confirmTx: confirmTx;
@@ -84,8 +85,10 @@ export const EvmForm: FC<EvmFormProps> = ({ confirmTx }) => {
     }
   }, []);
 
+
   useEffect(() => {
-    if (destinationIsInvalid || !destinationAccount || amount <= 0) return;
+    const isXcm = getValues("isXcm");
+    if (destinationIsInvalid || !isValidAddress(destinationAccount, isXcm ? undefined : "evm") || amount <= 0) return;
     (async () => {
       setIsLoadingFee(true);
 
@@ -94,11 +97,12 @@ export const EvmForm: FC<EvmFormProps> = ({ confirmTx }) => {
           ? Number(amount) * currencyUnits
           : Number(amount) * 10 ** asset.decimals;
 
+        if (isNaN(_amount)) return;
+
         const bnAmount = ethers.BigNumber.from(
           _amount.toLocaleString("fullwide", { useGrouping: false })
         );
 
-        const isXcm = getValues("isXcm");
         const to = getValues("to");
 
         if (isXcm) {
@@ -204,7 +208,7 @@ export const EvmForm: FC<EvmFormProps> = ({ confirmTx }) => {
           const gasLimit = await contract.estimateGas.transfer(
             destinationAccount,
             bnAmount
-          );
+          ).catch(() => BigNumber.from("21000"));
 
           const _gasLimit = gasLimit;
           const _maxFeePerGas = feeData.maxFeePerGas as ethers.BigNumber;
@@ -228,6 +232,16 @@ export const EvmForm: FC<EvmFormProps> = ({ confirmTx }) => {
           setEvmTx(contract);
         }
       } catch (error) {
+        console.log('fee', {
+          error
+        })
+        setFee({
+          "gas limit": BigNumber0,
+          "max fee per gas": BigNumber0,
+          "max priority fee per gas": BigNumber0,
+          "estimated fee": BigNumber0,
+          "estimated total": BigNumber0,
+        })
         captureError(error);
         showErrorToast(tCommon("failed_to_get_fees"));
       } finally {
@@ -255,6 +269,9 @@ export const EvmForm: FC<EvmFormProps> = ({ confirmTx }) => {
         ? Number(amount) * currencyUnits
         : Number(amount) * 10 ** asset.decimals;
 
+
+      if (isNaN(_amount)) return false;
+
       const bnAmount = BigNumber.from(
         _amount.toLocaleString("fullwide", { useGrouping: false })
       );
@@ -273,6 +290,9 @@ export const EvmForm: FC<EvmFormProps> = ({ confirmTx }) => {
         );
       }
     } catch (error) {
+      console.log('isEnoughToPay', {
+        error
+      })
       captureError(error);
       return false;
     }

src/pages/send/components/WasmForm.tsx

@@ -110,6 +110,8 @@ export const WasmForm: FC<WasmFormProps> = ({ confirmTx }) => {
         ? amount * currencyUnits
         : amount * 10 ** asset?.decimals || 0;
 
+      if (isNaN(_amount)) return;
+
       const bnAmount = new BN(
         String(_amount.toLocaleString("fullwide", { useGrouping: false }))
       );
@@ -265,6 +267,8 @@ export const WasmForm: FC<WasmFormProps> = ({ confirmTx }) => {
         ? amount * currencyUnits
         : amount * 10 ** asset.decimals;
 
+      if (isNaN(_amount)) return;
+
       const bnAmount = new BN(
         _amount.toLocaleString("fullwide", { useGrouping: false })
       );