Merge pull request #209 from stabilitydao/4-vault

Architecture update + codecov & unit tests
stabilitydao · Aug 6, 2024 · c416c06 · c416c06
2 parents d2f5940 + 054f0a7
commit c416c06
Show file tree

Hide file tree

Showing 65 changed files with 870 additions and 623 deletions.
diff --git a/README.md b/README.md
@@ -4,6 +4,12 @@
 
 [Issues](https://github.com/stabilitydao/stability-ui/issues)
 
+## Coverage
+
+[![codecov](https://codecov.io/gh/stabilitydao/stability-ui/graph/badge.svg?token=ER8QCFAF8C)](https://codecov.io/gh/stabilitydao/stability-ui)
+
+![Coverage Grid](https://codecov.io/gh/stabilitydao/stability-ui/graphs/tree.svg?token=ER8QCFAF8C)
+
 ## Develop
 
 ### 👀 Learn stack

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "stability-ui",
   "type": "module",
-  "version": "0.9.3-alpha",
+  "version": "0.9.5-alpha",
   "scripts": {
     "dev": "astro dev",
     "start": "astro dev",
@@ -58,6 +58,7 @@
     "eslint-plugin-prettier": "^5.2.1",
     "eslint-plugin-react": "^7.35.0",
     "eslint-plugin-react-hooks": "^4.6.2",
+    "jsdom": "^24.1.1",
     "prettier": "^3.3.3",
     "typescript": "^5.5.3",
     "vitest": "^2.0.2"

diff --git a/src/components/index.ts b/src/components/index.ts
@@ -1,49 +1,4 @@
-import { CreateVaultComponent } from "./CreateVaultComponent";
-import { Vault } from "./Vault";
-import { Vaults } from "./Vaults";
 import { Header } from "./Header";
 import { Footer } from "./Footer";
 
-import {
-  AssetsProportion,
-  TimeDifferenceIndicator,
-  VaultState,
-  VaultType,
-  Loader,
-  AssetsSkeleton,
-  ShareSkeleton,
-  ErrorMessage,
-  Skeleton,
-  HideFeesHandler,
-  APRtimeSwitcher,
-  FeeAPRModal,
-  ChartSkeleton,
-  HoldModal,
-  ShortAddress,
-} from "./VaultUtils";
-
-import { Toast } from "./VaultUtils/Toast";
-
-export {
-  CreateVaultComponent,
-  Vault,
-  Vaults,
-  VaultType,
-  Loader,
-  AssetsProportion,
-  Header,
-  Footer,
-  VaultState,
-  TimeDifferenceIndicator,
-  ShareSkeleton,
-  AssetsSkeleton,
-  Toast,
-  ErrorMessage,
-  Skeleton,
-  ChartSkeleton,
-  HideFeesHandler,
-  APRtimeSwitcher,
-  FeeAPRModal,
-  HoldModal,
-  ShortAddress,
-};
+export { Header, Footer };
diff --git a/src/layouts/AppStore.tsx b/src/layouts/AppStore.tsx
@@ -27,12 +27,9 @@ import {
   connected,
   apiData,
   lastTx,
-  transactionSettings,
-  hideFeeApr,
   reload,
   error,
   isWeb3Load,
-  aprFilter,
   currentChainID,
   assetsPrices,
   assetsBalances,
@@ -49,6 +46,7 @@ import {
   addVaultData,
   getTimeDifference,
   determineAPR,
+  getLocalStorageData,
 } from "@utils";
 
 import {
@@ -102,31 +100,6 @@ const AppStore = (props: React.PropsWithChildren): JSX.Element => {
 
   let stabilityAPIData: TAPIData = {};
 
-  const getLocalStorageData = () => {
-    const savedSettings = localStorage.getItem("transactionSettings");
-    const savedHideFeeAPR = localStorage.getItem("hideFeeAPR");
-    const APRsFiler = localStorage.getItem("APRsFiler");
-
-    if (savedSettings) {
-      const savedData = JSON.parse(savedSettings);
-      transactionSettings.set(savedData);
-    }
-    if (savedHideFeeAPR) {
-      const savedData = JSON.parse(savedHideFeeAPR);
-      hideFeeApr.set(savedData);
-    }
-
-    let localAPRfilter = APRsFiler ? JSON.parse(APRsFiler) : "weekly";
-
-    if (localAPRfilter === "week") {
-      localAPRfilter = "weekly";
-    } else if (localAPRfilter === "24h") {
-      localAPRfilter = "daily";
-    }
-
-    aprFilter.set(localAPRfilter);
-  };
-
   const getDataFromStabilityAPI = async () => {
     try {
       const response = await axios.get(STABILITY_API);

diff --git a/src/layouts/Layout.astro b/src/layouts/Layout.astro
@@ -16,14 +16,14 @@ const { title } = Astro.props as IProps;
 <html lang="en">
   <head>
     <!-- Google tag (gtag.js) -->
-    <script async src="https://www.googletagmanager.com/gtag/js?id=G-X8NC1VWRMV"></script>
+    <!-- <script async src="https://www.googletagmanager.com/gtag/js?id=G-X8NC1VWRMV"></script>
     <script>
       window.dataLayer = window.dataLayer || [];
       function gtag(){dataLayer.push(arguments);}
       gtag('js', new Date());
 
       gtag('config', import.meta.env.PUBLIC_GOOGLE_ANALYTICS_KEY);
-    </script>
+    </script> -->
     <meta charset="UTF-8" />
     <meta name="description" content="Asset Management Platform" />
     <meta name="viewport" content="width=device-width" />

diff --git a/...onents/CreateVaultComponent/BuildForm.tsx → src/modules/CreateVault/BuildForm.tsx b/...onents/CreateVaultComponent/BuildForm.tsx → src/modules/CreateVault/BuildForm.tsx
@@ -8,7 +8,7 @@ import {
   waitForTransactionReceipt,
 } from "@wagmi/core";
 
-import { Loader } from "@components";
+import { Loader } from "@ui";
 
 import { FactoryABI, ERC20ABI, wagmiConfig } from "@web3";
 

diff --git a/...components/CreateVaultComponent/index.tsx → src/modules/CreateVault/index.tsx b/...components/CreateVaultComponent/index.tsx → src/modules/CreateVault/index.tsx
@@ -47,7 +47,7 @@ type TFreeVaults =
 
 type TBuildingPrices = { [vaultType: string]: bigint };
 
-const CreateVaultComponent = (): JSX.Element => {
+const CreateVault = (): JSX.Element => {
   const $publicClient = useStore(publicClient);
   const $platformsData = useStore(platformsData);
   const $balances = useStore(balances);
@@ -268,7 +268,7 @@ const CreateVaultComponent = (): JSX.Element => {
   useEffect(() => {
     getBuildingPrices();
     getData();
-  }, [$publicClient, $platformsData[$currentChainID]?.factory, lastTx.get()]);
+  }, [$publicClient, $platformsData?.[$currentChainID]?.factory, lastTx.get()]);
 
   useEffect(() => {
     freeVaultsHandler();
@@ -510,7 +510,7 @@ const CreateVaultComponent = (): JSX.Element => {
           <h2 className="text-[22px] mt-5">Rewarding managed vault</h2>
           <div className="text-[22px] text-center">Coming soon</div>
 
-          {$platformsData[$currentChainID] && buildIndex !== undefined && (
+          {$platformsData?.[$currentChainID] && buildIndex !== undefined && (
             <div
               className="overlay"
               onClick={() => {
@@ -566,4 +566,4 @@ const CreateVaultComponent = (): JSX.Element => {
     </WagmiLayout>
   );
 };
-export { CreateVaultComponent };
+export { CreateVault };
diff --git a/src/components/Vault/Assets.tsx → src/modules/Vault/components/Assets.tsx b/src/components/Vault/Assets.tsx → src/modules/Vault/components/Assets.tsx
diff --git a/src/components/Vault/Contracts.tsx → src/modules/Vault/components/Contracts.tsx b/src/components/Vault/Contracts.tsx → src/modules/Vault/components/Contracts.tsx
diff --git a/...components/Vault/HistoricalRate/Chart.tsx → ...Vault/components/HistoricalRate/Chart.tsx b/...components/Vault/HistoricalRate/Chart.tsx → ...Vault/components/HistoricalRate/Chart.tsx
diff --git a/...ponents/Vault/HistoricalRate/ChartBar.tsx → ...lt/components/HistoricalRate/ChartBar.tsx b/...ponents/Vault/HistoricalRate/ChartBar.tsx → ...lt/components/HistoricalRate/ChartBar.tsx
diff --git a/...components/Vault/HistoricalRate/index.tsx → ...Vault/components/HistoricalRate/index.tsx b/...components/Vault/HistoricalRate/index.tsx → ...Vault/components/HistoricalRate/index.tsx
@@ -5,7 +5,7 @@ import axios from "axios";
 import { Chart } from "./Chart";
 import { ChartBar } from "./ChartBar";
 
-import { ChartSkeleton } from "@components";
+import { ChartSkeleton } from "@ui";
 
 import { formatFromBigInt } from "@utils";
 

diff --git a/src/components/Vault/InfoBar.tsx → src/modules/Vault/components/InfoBar.tsx b/src/components/Vault/InfoBar.tsx → src/modules/Vault/components/InfoBar.tsx
@@ -4,7 +4,7 @@ import { useStore } from "@nanostores/react";
 
 import { formatUnits } from "viem";
 
-import { APRtimeSwitcher, HideFeesHandler, FeeAPRModal } from "@components";
+import { APRtimeSwitcher, HideFeesHandler, FeeAPRModal } from "@ui";
 
 import { hideFeeApr, aprFilter } from "@store";
 

diff --git a/src/components/Vault/SettingsModal.tsx → ...t/components/InvestForm/SettingsModal.tsx b/src/components/Vault/SettingsModal.tsx → ...t/components/InvestForm/SettingsModal.tsx