Merge pull request #378 from enkryptcom/devop/prep-release-1-31

develop: prep release v1.31
enkryptcom · Jan 10, 2024 · c2ca03c · c2ca03c · github-actions · Jan 10, 2024
2 parents a3fc214 + dc9b984
commit c2ca03c
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 13 deletions.
diff --git a/packages/extension/package.json b/packages/extension/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@enkryptcom/extension",
-  "version": "1.30.0",
+  "version": "1.31.0",
   "private": true,
   "scripts": {
     "zip": "cd dist; zip -r release.zip *;",

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
@@ -2,11 +2,10 @@ import { NetworkNames } from "@enkryptcom/types";
 import { EvmNetwork, EvmNetworkOptions } from "../types/evm-network";
 import { EtherscanActivity } from "../libs/activity-handlers";
 import wrapActivityHandler from "@/libs/activity-state/wrap-activity-handler";
-import assetsInfoHandler from "@/providers/ethereum/libs/assets-handlers/assetinfo-mew";
 
 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/providers/polkadot/methods/dot_signer_signRaw.ts b/packages/extension/src/providers/polkadot/methods/dot_signer_signRaw.ts
@@ -16,7 +16,7 @@ const method: MiddlewareFunction = function (
     if (!payload.params?.length)
       return res(getCustomError("Missing Params: signer_signPayload"));
     const reqPayload = payload.params[0] as SignerPayloadRaw;
-    if (reqPayload.type !== "bytes")
+    if (reqPayload.type !== "bytes" && reqPayload.type !== "payload")
       return res(getCustomError("type is not bytes: signer_signRaw"));
     this.KeyRing.getAccount(polkadotEncodeAddress(reqPayload.address)).then(
       (account) => {

diff --git a/packages/extension/src/ui/action/App.vue b/packages/extension/src/ui/action/App.vue
@@ -53,6 +53,7 @@
         <transition :name="transitionName" mode="out-in">
           <component
             :is="Component"
+            :key="$route.fullPath"
             :network="currentNetwork"
             :account-info="accountHeaderData"
             @update:init="init"

diff --git a/packages/extension/src/ui/action/views/add-network/views/add-network-list.vue b/packages/extension/src/ui/action/views/add-network/views/add-network-list.vue
@@ -108,9 +108,10 @@ const searchAllNetworks = computed(() => {
     a.name_long.toLowerCase().startsWith(searchInput.value.toLowerCase())
   );
 });
-onBeforeMount(async () => {
+
+const setNetworkLists = async (isTestActive: boolean) => {
   const allNetworksNotTestNets = (await getAllNetworksAndStatus())
-    .filter(({ isTestNetwork }) => !isTestNetwork)
+    .filter(({ isTestNetwork }) => !isTestNetwork || isTestActive)
     .sort((a, b) => a.name_long.localeCompare(b.name_long));
 
   const popularNetworks = allNetworksNotTestNets
@@ -119,16 +120,15 @@ onBeforeMount(async () => {
 
   all.value = allNetworksNotTestNets;
   popular.value = popularNetworks;
+};
+
+onBeforeMount(async () => {
+  await setNetworkLists(showTestNets.value);
 });
 
 const onTestNetCheck = async () => {
   showTestNets.value = !showTestNets.value;
-
-  if (showTestNets.value) {
-    all.value = await getAllNetworksAndStatus();
-  } else {
-    all.value = all.value.filter(({ isTestNetwork }) => !isTestNetwork);
-  }
+  await setNetworkLists(showTestNets.value);
 };
 
 const onToggle = async (networkName: string, isActive: boolean) => {

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

diff --git a/packages/extension/src/ui/action/views/send-transaction/index.vue b/packages/extension/src/ui/action/views/send-transaction/index.vue
@@ -17,6 +17,7 @@ const sendLayouts: Record<ProviderName, any> = {
   [ProviderName.bitcoin]: SendTransactionBTC,
   [ProviderName.enkrypt]: null,
 };
+
 const layout = shallowRef();
 const route = useRoute();
 const networkName: string = route.params.id as string;