fix: assets loading for wrong network

enkryptcom · Jan 10, 2024 · 9e65507 · 9e65507 · github-actions · Jan 10, 2024
1 parent 3ced8a5
commit 9e65507
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/packages/extension/src/providers/ethereum/networks/aa.ts b/packages/extension/src/providers/ethereum/networks/aa.ts
@@ -13,7 +13,7 @@ const artheraOptions: EvmNetworkOptions = {
   isTestNetwork: false,
   currencyName: "AA",
   currencyNameLong: "Arthera",
-  node: "wss://ws.arthera.net",
+  node: "https://rpc.arthera.net",
   icon: require("./icons/aa.svg"),
   activityHandler: wrapActivityHandler(EtherscanActivity),
 };

diff --git a/packages/extension/src/providers/ethereum/networks/aat.ts b/packages/extension/src/providers/ethereum/networks/aat.ts
@@ -5,7 +5,7 @@ import wrapActivityHandler from "@/libs/activity-state/wrap-activity-handler";
 
 const artheraTestOptions: EvmNetworkOptions = {
   name: NetworkNames.ArtheraTest,
-  name_long: "Arthera",
+  name_long: "Arthera Test",
   homePage: "https://arthera.net/",
   blockExplorerTX: "https://explorer-test.arthera.net/tx/[[txHash]]",
   blockExplorerAddr: "https://explorer-test.arthera.net/address/[[address]]",

diff --git a/packages/extension/src/ui/action/views/network-assets/index.vue b/packages/extension/src/ui/action/views/network-assets/index.vue
@@ -97,9 +97,11 @@ const selected: string = route.params.id as string;
 const updateAssets = () => {
   isLoading.value = true;
   assets.value = [];
+  const currentNetwork = selectedNetworkName.value;
   props.network
     .getAllTokenInfo(props.accountInfo.selectedAccount?.address || "")
     .then((_assets) => {
+      if (selectedNetworkName.value !== currentNetwork) return;
       assets.value = _assets;
       isLoading.value = false;
     });