fix: resolved usePrice and XCM issue

AstarNetwork · Jul 5, 2024 · d02b2d0 · d02b2d0
1 parent 8524332
commit d02b2d0
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 17 deletions.
diff --git a/src/hooks/usePrice.ts b/src/hooks/usePrice.ts
@@ -1,7 +1,7 @@
 import { useStore } from 'src/store';
-import { computed, ref, watchEffect } from 'vue';
+import { computed, ref, watch } from 'vue';
 import { useNetworkInfo } from 'src/hooks';
-import { getUsdBySymbol } from '@astar-network/astar-sdk-core';
+import { getUsdBySymbol, wait } from '@astar-network/astar-sdk-core';
 
 export function usePrice() {
   const store = useStore();
@@ -13,18 +13,24 @@ export function usePrice() {
 
   const { isMainnet, isAstarZkEvm } = useNetworkInfo();
 
-  watchEffect(async () => {
-    const tokenSymbolRef = tokenSymbol.value;
-    if (!tokenSymbolRef) return;
-    try {
-      if (isMainnet.value) {
-        const nativeToken = isAstarZkEvm.value ? 'ETH' : tokenSymbolRef;
-        nativeTokenUsd.value = await getUsdBySymbol(nativeToken);
+  watch(
+    [tokenSymbol],
+    async () => {
+      // Memo: hacky way to fix the 'invalid BigNumber string' error
+      await wait(500);
+      const tokenSymbolRef = tokenSymbol.value;
+      if (!tokenSymbolRef) return;
+      try {
+        if (isMainnet.value) {
+          const nativeToken = isAstarZkEvm.value ? 'ETH' : tokenSymbolRef;
+          nativeTokenUsd.value = await getUsdBySymbol(nativeToken);
+        }
+      } catch (error: any) {
+        console.error(error.message);
       }
-    } catch (error: any) {
-      console.error(error.message);
-    }
-  });
+    },
+    { immediate: true }
+  );
 
   return {
     nativeTokenUsd,

diff --git a/src/hooks/xcm/useTransferRouter.ts b/src/hooks/xcm/useTransferRouter.ts
@@ -26,7 +26,7 @@ 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.SHIDEN;
+const disabledXcmChain: endpointKey | undefined = undefined;
 
 export interface NetworkFromTo {
   from: string;

diff --git a/src/v2/repositories/implementations/PolkasafeRepository.ts b/src/v2/repositories/implementations/PolkasafeRepository.ts
@@ -20,10 +20,10 @@ export class PolkasafeRepository implements IPolkasafeRepository {
     const polkasafeClient = container.get<PolkasafeWrapper>(Symbols.PolkasafeClient);
     const { data, error } = await polkasafeClient.customTransactionAsMulti(
       multisigAddress,
-      transaction,
+      transaction as any,
       undefined,
       isProxyAccount,
-      new BN(tip)
+      new BN(tip) as any
     );
     if (error) {
       console.error('error', error);

diff --git a/src/v2/repositories/implementations/XcmRepository.ts b/src/v2/repositories/implementations/XcmRepository.ts
@@ -167,7 +167,9 @@ export class XcmRepository implements IXcmRepository {
           },
           id: {
             Concrete: {
-              interior: 'Here',
+              interior: {
+                Here: null,
+              },
               parents: new BN(0),
             },
           },