Merge pull request #211 from stabilitydao/4-vault

invest form fix

package.json

@@ -1,7 +1,7 @@
 {
   "name": "stability-ui",
   "type": "module",
-  "version": "0.9.5-alpha",
+  "version": "0.9.6-alpha",
   "scripts": {
     "dev": "astro dev",
     "start": "astro dev",

src/constants/index.ts

@@ -129,13 +129,13 @@ const CHAINS = [
     explorer: "https://polygonscan.com/address/",
     active: true, // main page active networks
   },
-  // {
-  //   name: "Base",
-  //   id: "8453",
-  //   logoURI: "https://www.base.org/document/favicon-32x32.png",
-  //   explorer: "https://basescan.org/address/",
-  //   active: true, // main page active networks
-  // },
+  {
+    name: "Base",
+    id: "8453",
+    logoURI: "https://www.base.org/document/favicon-32x32.png",
+    explorer: "https://basescan.org/address/",
+    active: true, // main page active networks
+  },
 ];
 
 const YEARN_PROTOCOLS = ["aave", "stargate", "stmatic", "compound"];

src/layouts/Layout.astro

@@ -346,6 +346,7 @@ const { title } = Astro.props as IProps;
 		box-sizing:border-box;
 		box-shadow:0 1px 8px rgba(0,0,0,0.5);
 		display:none;
+		pointer-events: none;
 	}
 	.toLeft {
 		top:230px !important;

src/modules/Vault/functions/handleInputKeyDown.ts

@@ -0,0 +1,27 @@
+const handleInputKeyDown = (
+  evt: React.KeyboardEvent<HTMLInputElement>,
+  currentValue: string
+): void => {
+  if (
+    !/[\d.]/.test(evt.key) &&
+    evt.key !== "Backspace" &&
+    evt.key !== "ArrowLeft" &&
+    evt.key !== "ArrowRight"
+  ) {
+    evt.preventDefault();
+  }
+
+  if (evt.key === "0" && currentValue === "0") {
+    evt.preventDefault();
+  }
+
+  if (/^\d/.test(evt.key) && currentValue === "0" && evt.key !== ".") {
+    evt.preventDefault();
+  }
+
+  if (evt.key === "." && currentValue && currentValue.includes(".")) {
+    evt.preventDefault();
+  }
+};
+
+export { handleInputKeyDown };

src/modules/Vault/functions/index.ts

@@ -1,5 +1,11 @@
 import { getAssetAllowance } from "./getAssetAllowance";
 import { getPlatformBalance } from "./getPlatformBalance";
 import { getAssetsBalances } from "./getAssetsBalances";
+import { handleInputKeyDown } from "./handleInputKeyDown";
 
-export { getAssetAllowance, getPlatformBalance, getAssetsBalances };
+export {
+  getAssetAllowance,
+  getPlatformBalance,
+  getAssetsBalances,
+  handleInputKeyDown,
+};

src/modules/Vault/tests/handleInputKeyDown.test.ts

@@ -0,0 +1,79 @@
+import { describe, it, expect, vi } from "vitest";
+import { handleInputKeyDown } from "../functions";
+
+describe("handleInputKeyDown", () => {
+  it("should allow digits to be entered", () => {
+    const preventDefault = vi.fn();
+    const event = {
+      key: "1",
+      preventDefault,
+    } as unknown as React.KeyboardEvent<HTMLInputElement>;
+
+    handleInputKeyDown(event, "");
+
+    expect(preventDefault).not.toHaveBeenCalled();
+  });
+
+  it("should prevent multiple leading zeroes", () => {
+    const preventDefault = vi.fn();
+    const event = {
+      key: "0",
+      preventDefault,
+    } as unknown as React.KeyboardEvent<HTMLInputElement>;
+
+    handleInputKeyDown(event, "0");
+
+    expect(preventDefault).toHaveBeenCalled();
+  });
+
+  it("should allow a single decimal point", () => {
+    const preventDefault = vi.fn();
+    const event = {
+      key: ".",
+      preventDefault,
+    } as unknown as React.KeyboardEvent<HTMLInputElement>;
+
+    handleInputKeyDown(event, "123");
+
+    expect(preventDefault).not.toHaveBeenCalled();
+  });
+
+  it("should prevent multiple decimal points", () => {
+    const preventDefault = vi.fn();
+    const event = {
+      key: ".",
+      preventDefault,
+    } as unknown as React.KeyboardEvent<HTMLInputElement>;
+
+    handleInputKeyDown(event, "123.");
+
+    expect(preventDefault).toHaveBeenCalled();
+  });
+
+  it("should allow backspace and arrow keys", () => {
+    const preventDefault = vi.fn();
+
+    ["Backspace", "ArrowLeft", "ArrowRight"].forEach((key) => {
+      const event = {
+        key,
+        preventDefault,
+      } as unknown as React.KeyboardEvent<HTMLInputElement>;
+
+      handleInputKeyDown(event, "123");
+
+      expect(preventDefault).not.toHaveBeenCalled();
+    });
+  });
+
+  it("should prevent invalid characters", () => {
+    const preventDefault = vi.fn();
+    const event = {
+      key: "a",
+      preventDefault,
+    } as unknown as React.KeyboardEvent<HTMLInputElement>;
+
+    handleInputKeyDown(event, "123");
+
+    expect(preventDefault).toHaveBeenCalled();
+  });
+});

src/utils/functions/get1InchRoutes.ts

@@ -54,8 +54,13 @@ export const get1InchRoutes = async (
     try {
       const response = await axios.get(url);
 
-      setError(false);
+      if (!response?.data[0]?.amountOut) {
+        throw new Error(
+          `1inch status: ${response?.data?.[0]?.aggApiReply.status}`
+        );
+      }
 
+      setError(false);
       return {
         symbol: symbol as string,
         address: address,
@@ -71,7 +76,7 @@ export const get1InchRoutes = async (
         console.log(`Retrying (${currentRetry}/${maxRetries})...`, url);
         await new Promise((resolve) => setTimeout(resolve, 1000));
       } else {
-        console.error("1INCH API ERROR:", error);
+        console.error("1inch api error:", error);
         setError(true);
 
         return {