Merge branch 'staging' of https://github.com/zeitgeistpm/ui into xcm-…

…fix-relay-chain
zeitgeistpm · Aug 27, 2024 · 1df1f45 · 1df1f45
2 parents 30b009c + 36d1113
commit 1df1f45
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 8 deletions.
diff --git a/lib/constants/index.ts b/lib/constants/index.ts
@@ -41,10 +41,16 @@ export const ZTG_CHAIN_ID = "polkadot:1bf2a2ecb4a868de66ea8610f2ce7c8c";
 
 export const endpoints: EndpointOption[] = [
   {
-    value: "wss://zeitgeist.api.onfinality.io/public-ws",
+    value:
+      "wss://zeitgeist.api.onfinality.io/ws?apikey=fcfa6c61-e80e-4bb9-b255-44c2c82d0ddb",
     label: "OnFinality",
     environment: "production",
   },
+  {
+    value: "wss://zeitgeist.api.onfinality.io/public-ws",
+    label: "OnFinalityPublic",
+    environment: "production",
+  },
   {
     value: "wss://main.rpc.zeitgeist.pm/ws",
     label: "ZeitgeistPM",

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);
 };