Merge pull request #2449 from zeitgeistpm/portfolio-hotfix

Fix Portfolio Balance
zeitgeistpm · Aug 19, 2024 · 081b919 · 081b919
2 parents e21dde3 + 581a023
commit 081b919
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/lib/hooks/queries/useBalance.ts b/lib/hooks/queries/useBalance.ts
@@ -49,9 +49,9 @@ export const fetchAssetBalance = async (
   if (IOZtgAssetId.is(assetId)) {
     const { data } = await api.query.system.account(address);
     return calculateFreeBalance(
-      data.free.toString(),
-      data.miscFrozen.toString(),
-      data.feeFrozen.toString(),
+      data?.free?.toString(),
+      data?.miscFrozen?.toString(),
+      data?.feeFrozen?.toString(),
     );
   } else if (IOCurrencyAsset.is(assetId)) {
     if (

diff --git a/lib/hooks/queries/useCurrencyBalances.ts b/lib/hooks/queries/useCurrencyBalances.ts
@@ -59,9 +59,9 @@ export const useCurrencyBalances = (address: string) => {
         const { data } = await sdk.api.query.system.account(address);
 
         const nativeBalance = calculateFreeBalance(
-          data.free.toString(),
-          data.miscFrozen.toString(),
-          data.feeFrozen.toString(),
+          data?.free?.toString(),
+          data?.miscFrozen?.toString(),
+          data?.feeFrozen?.toString(),
         );
 
         const apisArray = Object.values(apis ?? {});

diff --git a/lib/util/calc-free-balance.ts b/lib/util/calc-free-balance.ts
@@ -5,6 +5,9 @@ export const calculateFreeBalance = (
   miscFrozen: string,
   feeFrozen: string,
 ) => {
-  const maxFrozen = Decimal.max(miscFrozen, feeFrozen);
+  const maxFrozen = Decimal.max(
+    miscFrozen ? miscFrozen : 0,
+    feeFrozen ? feeFrozen : 0,
+  );
   return new Decimal(free).minus(maxFrozen);
 };