upd: error message + chart + tests fix

stabilitydao · Nov 2, 2024 · e45c958 · e45c958
1 parent d14a718
commit e45c958
Show file tree

Hide file tree

Showing 10 changed files with 166 additions and 204 deletions.
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "stability-ui",
   "type": "module",
-  "version": "0.13.16-alpha",
+  "version": "0.13.17-alpha",
   "scripts": {
     "dev": "astro dev",
     "start": "astro dev",

diff --git a/src/layouts/AppStore.tsx b/src/layouts/AppStore.tsx
@@ -38,8 +38,6 @@ import {
 
 import { wagmiConfig, platforms, PlatformABI, IVaultManagerABI } from "@web3";
 
-import { ErrorMessage } from "@ui";
-
 import {
   calculateAPY,
   getStrategyInfo,
@@ -100,7 +98,8 @@ const AppStore = (props: React.PropsWithChildren): JSX.Element => {
 
   const $lastTx = useStore(lastTx);
   const $reload = useStore(reload);
-  const $error = useStore(error);
+
+  let isError = false;
 
   const localVaults: {
     [network: string]: TVaults;
@@ -110,6 +109,11 @@ const AppStore = (props: React.PropsWithChildren): JSX.Element => {
 
   let stabilityAPIData: TAPIData = {};
 
+  const handleError = (errType: string, description: string) => {
+    error.set({ state: true, type: errType, description });
+    isError = true;
+  };
+
   const getDataFromStabilityAPI = async () => {
     const maxRetries = 3;
     let currentRetry = 0;
@@ -121,11 +125,7 @@ const AppStore = (props: React.PropsWithChildren): JSX.Element => {
         stabilityAPIData = response.data;
 
         if (stabilityAPIData?.error) {
-          error.set({
-            state: true,
-            type: "API",
-            description: stabilityAPIData?.error,
-          });
+          handleError("API", stabilityAPIData?.error);
           return;
         }
 
@@ -143,11 +143,7 @@ const AppStore = (props: React.PropsWithChildren): JSX.Element => {
           await new Promise((resolve) => setTimeout(resolve, 1000));
         } else {
           console.error("API error:", err);
-          error.set({
-            state: true,
-            type: "API",
-            description: err?.message,
-          });
+          handleError("API", err);
         }
       }
     }
@@ -697,6 +693,7 @@ const AppStore = (props: React.PropsWithChildren): JSX.Element => {
               isVaultsLoaded.set(true);
             } catch (txError: any) {
               console.log("BLOCKCHAIN ERROR:", txError);
+
               error.set({
                 state: true,
                 type: "WEB3",
@@ -724,7 +721,9 @@ const AppStore = (props: React.PropsWithChildren): JSX.Element => {
 
     await getDataFromStabilityAPI();
 
-    getData();
+    if (!isError) {
+      getData();
+    }
 
     if (chain?.id) {
       currentChainID.set(String(chain?.id));
@@ -739,14 +738,6 @@ const AppStore = (props: React.PropsWithChildren): JSX.Element => {
     fetchAllData();
   }, [address, chain?.id, isConnected, $lastTx, $reload]);
 
-  if ($error.state && $error.type === "API") {
-    return (
-      <div className="absolute top-1/2 left-1/2 transform -translate-x-1/2 -translate-y-1/2">
-        <ErrorMessage type="API" />
-      </div>
-    );
-  }
-
   return (
     <WagmiLayout>
       <div className="flex flex-col flex-1">{props.children}</div>

diff --git a/src/modules/Platform/components/Chains/Chain.tsx b/src/modules/Platform/components/Chains/Chain.tsx
@@ -72,7 +72,7 @@ const Chain: React.FC<IProps> = ({ chain }) => {
     },
     {
       name: "TVL",
-      content: `\$${formatNumber($apiData?.total.chainTvl[chain.toString()] ? $apiData?.total.chainTvl[chain.toString()].toFixed(0) : "-", "withSpaces")}`,
+      content: `${formatNumber($apiData?.total.chainTvl[chain.toString()] ? $apiData?.total.chainTvl[chain.toString()].toFixed(0) : "-", "abbreviate")}`,
     },
   ];
 
@@ -101,7 +101,7 @@ const Chain: React.FC<IProps> = ({ chain }) => {
         content: chainVaults.length,
       },
       {
-        name: "Vaults APR",
+        name: "APR",
         content: `${weightedAverageAPR.toFixed(2)}%`,
       },
       {