From 2feed4c0d2a6ecf86ebeb3349ba7ada2605e5bac Mon Sep 17 00:00:00 2001 From: arobsn <87387688+arobsn@users.noreply.github.com> Date: Tue, 13 Aug 2024 10:49:55 -0300 Subject: [PATCH 1/2] fix `localStorage` migration --- src/stores/appStore.ts | 2 +- src/stores/assetsStore.ts | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/stores/appStore.ts b/src/stores/appStore.ts index 253cd0b..84506c5 100644 --- a/src/stores/appStore.ts +++ b/src/stores/appStore.ts @@ -71,7 +71,7 @@ export const useAppStore = defineStore("app", () => { if (!settings.value.isKyaAccepted && privateState.wallets.length > 0) { const oldSettings = localStorage.getItem("settings"); if (oldSettings) { - settings.value = JSON.parse(oldSettings); // migrate settings + settings.value = { ...DEFAULT_SETTINGS, ...JSON.parse(oldSettings) }; // migrate settings localStorage.clear(); // clear old settings } else { settings.value = { diff --git a/src/stores/assetsStore.ts b/src/stores/assetsStore.ts index f9c4f26..cbb468b 100644 --- a/src/stores/assetsStore.ts +++ b/src/stores/assetsStore.ts @@ -1,6 +1,6 @@ import { acceptHMRUpdate, defineStore } from "pinia"; import { computed, onMounted, shallowReactive, watch } from "vue"; -import { ensureDefaults, uniq } from "@fleet-sdk/common"; +import { ensureDefaults, isEmpty, uniq } from "@fleet-sdk/common"; import { useAppStore } from "./appStore"; import { assetInfoDbService } from "@/database/assetInfoDbService"; import { graphQLService } from "@/chains/ergo/services/graphQlService"; @@ -90,6 +90,8 @@ export const useAssetsStore = defineStore("assets", () => { const blacklist = computed(() => { let tokenIds = [] as string[]; + if (isEmpty(privateState.blacklist)) return tokenIds; + for (const listName of app.settings.blacklistedTokensLists) { const list = privateState.blacklist[listName as keyof ErgoTokenBlacklist]; if (Array.isArray(list) && list.length > 0) tokenIds = tokenIds.concat(list); From 4801d01003f1f4054bbd94ad4a5649ca95de56c5 Mon Sep 17 00:00:00 2001 From: arobsn <87387688+arobsn@users.noreply.github.com> Date: Tue, 13 Aug 2024 10:51:13 -0300 Subject: [PATCH 2/2] bump version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index d781a2c..ac1dd88 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "nautilus-wallet", - "version": "0.13.0-beta.2", + "version": "0.13.0-beta.3", "private": true, "type": "module", "engines": {