Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

develop: prep release v1.31 #378

Merged
merged 4 commits into from
Jan 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/extension/package.json
Original file line number Diff line number Diff line change
@@ -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 *;",
Expand Down
2 changes: 1 addition & 1 deletion packages/extension/src/providers/ethereum/networks/aa.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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),
};
Expand Down
3 changes: 1 addition & 2 deletions packages/extension/src/providers/ethereum/networks/aat.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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]]",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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) => {
Expand Down
1 change: 1 addition & 0 deletions packages/extension/src/ui/action/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@
<transition :name="transitionName" mode="out-in">
<component
:is="Component"
:key="$route.fullPath"
:network="currentNetwork"
:account-info="accountHeaderData"
@update:init="init"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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) => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down