hotfix: merge the hotfix to main branch (#848) · AstarNetwork/astar-apps@c52cdc8

4everland · 2023-06-30T10:37:00Z

parameters	Value
IC	b5oiz-tyaaa-aaaag-abp6a-cai
Assigned domain	https://b5oiz-tyaaa-aaaag-abp6a-cai.ic0.app/
Custom domain	https://decentralized.portal.astar.network

-Original file line number
+Diff line change
@@ Expand Up / @@ -269,7 +269,9 @@ export default defineComponent({ @@
             bal.value = Number(ethers.utils.formatEther(balWei));
             isShibuya.value = nativeTokenSymbol.value === 'SBY';
             isRocstar.value = nativeTokenSymbol.value === 'RSTR';
-            isFaucet.value = isRocstar ? false : isShibuya.value || faucetBalRequirement > bal.value;
+            isFaucet.value = isRocstar.value
+              ? false
+              : isShibuya.value || faucetBalRequirement > bal.value;
             if (nativeTokenUsd) {
               balUsd.value = nativeTokenUsd * bal.value;
             }
@@ Expand Down @@

-Original file line number
+Diff line change
@@ Expand Up / @@ -73,15 +73,20 @@ export function useClaimAll() { @@
           }
           const txs = await Promise.all(
             dapps.value.map(async (it) => {
-              if (it.dapp && !isH160.value) {
-                const transactions = await getIndividualClaimTxs({
-                  dappAddress: it?.dapp?.address,
-                  api,
-                  senderAddress: senderAddressRef,
-                  currentEra: era.value,
-                });
-                return transactions.length ? transactions : null;
-              } else {
+              try {
+                if (it.dapp && !isH160.value) {
+                  const transactions = await getIndividualClaimTxs({
+                    dappAddress: it?.dapp?.address,
+                    api,
+                    senderAddress: senderAddressRef,
+                    currentEra: era.value,
+                  });
+                  return transactions.length ? transactions : null;
+                } else {
+                  return null;
+                }
+              } catch (error) {
+                console.error(error);
                 return null;
               }
             })
@@ Expand Down @@

-Original file line number
+Diff line change
@@ Expand Up / @@ -25,9 +25,9 @@ export type TransferMode = 'local' | 'xcm'; @@
     export const astarNetworks = ['astar', 'shiden', 'shibuya'];
     export const astarNativeTokens = ['sdn', 'astr', 'sby'];
     // e.g.: endpointKey.SHIDEN;
-    const disabledXcmChain: endpointKey | undefined = endpointKey.ASTAR;
+    const disabledXcmChain: endpointKey | undefined = undefined;
     // e.g.: [Chain.INTERLAY, Chain.KINTSUGI]
-    const disabledXcmParachains: string[] = [Chain.INTERLAY, Chain.KINTSUGI];
+    const disabledXcmParachains: Chain[] = [];
     export interface NetworkFromTo {
       from: string;
@@ Expand Down @@

-Original file line number
+Diff line change
@@ Expand Up / @@ -255,10 +255,7 @@ export function useXcmBridge(selectedToken: Ref<Asset>) { @@
             });
             return;
           }
-          const originChainNativeBal = await originChainApi.value?.query.system.account(
-            currentAccount.value
-          );
-          if (Number(originChainNativeBal?.data.free) === 0) {
+          if ((await getOriginChainNativeBal()) === '0') {
             errMsg.value = t('warning.insufficientOriginChainNativeBalance', {
               chain: selectedToken.value.originChain,
             });
@@ Expand Down @@

-Original file line number
+Diff line change
@@ Expand Up / @@ -233,7 +233,7 @@ export const xcmChainObj: XcmChainObj = { @@
         parachainId: parachainIds.UNIQUE,
         endpoint: 'wss://ws.unique.network',
         subscan: 'https://unique.subscan.io',
-        isAstarNativeToken: true,
+        isAstarNativeToken: false,
       },
     };
@@ Expand Down @@

Provide feedback