@subwallet/extension-base 1.0.3-0 → 1.0.4-1

package/cjs/services/chain-service/index.js

@@ -47,7 +47,6 @@ class ChainService {
     this.chainInfoMapSubject.next(this.dataMap.chainInfoMap);
     this.chainStateMapSubject.next(this.dataMap.chainStateMap);
     this.assetRegistrySubject.next(this.dataMap.assetRegistry);
-    this.multiChainAssetMapSubject.next(_chainList.MultiChainAssetMap);
     this.xcmRefMapSubject.next(this.getXcmRefMap());
     this.logger = (0, _logger.logger)('chain-service');
     this.refreshChainStateInterval(3000, 6);
@@ -359,7 +358,9 @@ class ChainService {
   // Business logic
   async init() {
     // TODO: reconsider the flow of initiation
-    this.dataMap.assetRefMap = _chainList.AssetRefMap;
+    const [latestAssetRefMap, latestMultiChainAssetMap] = await Promise.all([this.fetchLatestData(_constants._ASSET_REF_SRC, _chainList.AssetRefMap), this.fetchLatestData(_constants._MULTI_CHAIN_ASSET_SRC, _chainList.MultiChainAssetMap)]);
+    this.multiChainAssetMapSubject.next(latestMultiChainAssetMap);
+    this.dataMap.assetRefMap = latestAssetRefMap;
     await this.initChains();
     this.chainInfoMapSubject.next(this.getChainInfoMap());
     this.chainStateMapSubject.next(this.getChainStateMap());
@@ -464,16 +465,16 @@ class ChainService {
     this.eventService.emit('chain.updateState', chainSlug);
     return true;
   }
-  checkExistedPredefinedChain(genesisHash, evmChainId) {
+  checkExistedPredefinedChain(latestChainInfoMap, genesisHash, evmChainId) {
     let duplicatedSlug = '';
     if (genesisHash) {
-      Object.values(_chainList.ChainInfoMap).forEach(chainInfo => {
+      Object.values(latestChainInfoMap).forEach(chainInfo => {
         if (chainInfo.substrateInfo && chainInfo.substrateInfo.genesisHash === genesisHash) {
           duplicatedSlug = chainInfo.slug;
         }
       });
     } else if (evmChainId) {
-      Object.values(_chainList.ChainInfoMap).forEach(chainInfo => {
+      Object.values(latestChainInfoMap).forEach(chainInfo => {
         if (chainInfo.evmInfo && chainInfo.evmInfo.evmChainId === evmChainId) {
           duplicatedSlug = chainInfo.slug;
         }
@@ -481,8 +482,47 @@ class ChainService {
     }
     return duplicatedSlug;
   }
+  async fetchLatestData(src, defaultValue) {
+    return Promise.resolve(defaultValue);
+    // try {
+    //   const timeout = new Promise((resolve) => {
+    //     const id = setTimeout(() => {
+    //       clearTimeout(id);
+    //       resolve(null);
+    //     }, 1500);
+    //   });
+    //   let result = defaultValue;
+    //   const resp = await Promise.race([
+    //     timeout,
+    //     fetch(src)
+    //   ]) as Response || null;
+    //
+    //   if (!resp) {
+    //     console.warn('Error fetching latest data', src);
+    //
+    //     return result;
+    //   }
+    //
+    //   if (resp.ok) {
+    //     try {
+    //       result = await resp.json();
+    //       console.log('Fetched latest data', src);
+    //     } catch (err) {
+    //       console.warn('Error parsing latest data', src, err);
+    //     }
+    //   }
+    //
+    //   return result;
+    // } catch (e) {
+    //   console.warn('Error fetching latest data', src, e);
+    //
+    //   return defaultValue;
+    // }
+  }
+
   async initChains() {
     const storedChainSettings = await this.dbService.getAllChainStore();
+    const latestChainInfoMap = await this.fetchLatestData(_constants._CHAIN_INFO_SRC, _chainList.ChainInfoMap);
     const storedChainSettingMap = {};
     storedChainSettings.forEach(chainStoredSetting => {
       storedChainSettingMap[chainStoredSetting.slug] = chainStoredSetting;
@@ -491,8 +531,8 @@ class ChainService {
     const deprecatedChains = [];
     const deprecatedChainMap = {};
     if (storedChainSettings.length === 0) {
-      this.dataMap.chainInfoMap = _chainList.ChainInfoMap;
-      Object.values(_chainList.ChainInfoMap).forEach(chainInfo => {
+      this.dataMap.chainInfoMap = latestChainInfoMap;
+      Object.values(latestChainInfoMap).forEach(chainInfo => {
         this.dataMap.chainStateMap[chainInfo.slug] = {
           currentProvider: Object.keys(chainInfo.providers)[0],
           slug: chainInfo.slug,
@@ -508,10 +548,10 @@ class ChainService {
         });
       });
     } else {
-      const mergedChainInfoMap = _chainList.ChainInfoMap;
+      const mergedChainInfoMap = latestChainInfoMap;
       for (const [storedSlug, storedChainInfo] of Object.entries(storedChainSettingMap)) {
-        if (storedSlug in _chainList.ChainInfoMap) {
-          // check predefined chains first, update providers and currentProvider
+        if (storedSlug in latestChainInfoMap) {
+          // check predefined chains first, keep setting for providers and currentProvider
           mergedChainInfoMap[storedSlug].providers = {
             ...storedChainInfo.providers,
             ...mergedChainInfoMap[storedSlug].providers
@@ -531,7 +571,7 @@ class ChainService {
           var _storedChainInfo$subs, _storedChainInfo$evmI;
           // only custom chains are left
           // check custom chain duplicated with predefined chain => merge into predefined chain
-          const duplicatedDefaultSlug = this.checkExistedPredefinedChain((_storedChainInfo$subs = storedChainInfo.substrateInfo) === null || _storedChainInfo$subs === void 0 ? void 0 : _storedChainInfo$subs.genesisHash, (_storedChainInfo$evmI = storedChainInfo.evmInfo) === null || _storedChainInfo$evmI === void 0 ? void 0 : _storedChainInfo$evmI.evmChainId);
+          const duplicatedDefaultSlug = this.checkExistedPredefinedChain(latestChainInfoMap, (_storedChainInfo$subs = storedChainInfo.substrateInfo) === null || _storedChainInfo$subs === void 0 ? void 0 : _storedChainInfo$subs.genesisHash, (_storedChainInfo$evmI = storedChainInfo.evmInfo) === null || _storedChainInfo$evmI === void 0 ? void 0 : _storedChainInfo$evmI.evmChainId);
           if (duplicatedDefaultSlug.length > 0) {
             // merge custom chain with existed chain
             mergedChainInfoMap[duplicatedDefaultSlug].providers = {
@@ -602,10 +642,11 @@ class ChainService {
   }
   async initAssetRegistry(deprecatedCustomChainMap) {
     const storedAssetRegistry = await this.dbService.getAllAssetStore();
+    const latestAssetRegistry = await this.fetchLatestData(_constants._CHAIN_ASSET_SRC, _chainList.ChainAssetMap);
     if (storedAssetRegistry.length === 0) {
-      this.dataMap.assetRegistry = _chainList.ChainAssetMap;
+      this.dataMap.assetRegistry = latestAssetRegistry;
     } else {
-      const mergedAssetRegistry = _chainList.ChainAssetMap;
+      const mergedAssetRegistry = latestAssetRegistry;
       const parsedStoredAssetRegistry = {};
       const deprecatedAssets = [];
 
@@ -627,7 +668,7 @@ class ChainService {
       });
       for (const assetInfo of Object.values(parsedStoredAssetRegistry)) {
         let duplicated = false;
-        for (const defaultChainAsset of Object.values(_chainList.ChainAssetMap)) {
+        for (const defaultChainAsset of Object.values(latestAssetRegistry)) {
           // case merge custom asset with default asset
           if ((0, _utils._isEqualSmartContractAsset)(assetInfo, defaultChainAsset)) {
             duplicated = true;
@@ -1169,13 +1210,12 @@ class ChainService {
     }
     return this.assetSettingSubject.value;
   }
-  async updateAssetSetting(assetSlug, assetSetting) {
+  async updateAssetSetting(assetSlug, assetSetting, autoEnableNativeToken) {
     const currentAssetSettings = await this.getAssetSettings();
     let needUpdateSubject;
 
     // Update settings
     currentAssetSettings[assetSlug] = assetSetting;
-    this.setAssetSettings(currentAssetSettings);
     if (assetSetting.visible) {
       const assetInfo = this.getAssetBySlug(assetSlug);
       const chainState = this.getChainStateByKey(assetInfo.originChain);
@@ -1184,8 +1224,15 @@ class ChainService {
       if (chainState && !chainState.active) {
         this.enableChain(chainState.slug);
         needUpdateSubject = true;
+        if (autoEnableNativeToken) {
+          const nativeAsset = this.getNativeTokenInfo(assetInfo.originChain);
+          currentAssetSettings[nativeAsset.slug] = {
+            visible: true
+          };
+        }
       }
     }
+    this.setAssetSettings(currentAssetSettings);
     return needUpdateSubject;
   }
   async updateAssetSettingByChain(chainSlug, visible) {
@@ -1203,10 +1250,41 @@ class ChainService {
     return this.assetSettingSubject;
   }
   async getChainLogoMap() {
-    return Promise.resolve(_chainList.ChainLogoMap);
+    return await this.fetchLatestData(_constants._CHAIN_LOGO_MAP_SRC, _chainList.ChainLogoMap);
   }
   async getAssetLogoMap() {
-    return Promise.resolve(_chainList.AssetLogoMap);
+    return await this.fetchLatestData(_constants._ASSET_LOGO_MAP_SRC, _chainList.AssetLogoMap);
+  }
+  resetWallet(resetAll) {
+    if (resetAll) {
+      this.setAssetSettings({});
+
+      // Disconnect chain
+      const activeChains = this.getActiveChainInfos();
+      for (const chain of Object.keys(activeChains)) {
+        if (!_constants._DEFAULT_ACTIVE_CHAINS.includes(chain)) {
+          this.disableChain(chain);
+        }
+      }
+
+      // Remove custom chain
+      const allChains = this.getChainInfoMap();
+      for (const chain of Object.keys(allChains)) {
+        if ((0, _utils._isCustomChain)(chain)) {
+          this.removeCustomChain(chain);
+        }
+      }
+
+      // Remove custom asset
+      const assetSettings = this.getAssetSettings();
+      const customToken = [];
+      for (const asset of Object.keys(assetSettings)) {
+        if ((0, _utils._isCustomAsset)(asset)) {
+          customToken.push(asset);
+        }
+      }
+      this.deleteCustomAssets(customToken);
+    }
   }
 }
 exports.ChainService = ChainService;

package/cjs/services/keyring-service/index.js

@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.KeyringService = void 0;
+var _constants = require("@subwallet/extension-base/constants");
 var _stores = require("@subwallet/extension-base/stores");
 var _uiKeyring = require("@subwallet/ui-keyring");
 var _rxjs = require("rxjs");
@@ -95,5 +96,13 @@ class KeyringService {
     this.eventService.emit('account.updateCurrent', currentAccountData);
     this.currentAccountStore.set('CurrentAccountInfo', currentAccountData);
   }
+  resetWallet(resetAll) {
+    _uiKeyring.keyring.resetWallet(resetAll);
+    this.updateKeyringState();
+    this.currentAccountSubject.next({
+      address: _constants.ALL_ACCOUNT_KEY,
+      currentGenesisHash: null
+    });
+  }
 }
 exports.KeyringService = KeyringService;

package/cjs/services/migration-service/index.js

@@ -19,8 +19,11 @@ class MigrationService {
   async run() {
     this.logger.log('Migrating...');
     const keys = Object.keys(_scripts.default).sort((a, b) => a.localeCompare(b));
-    try {
-      for (let i = 0; i < keys.length; i++) {
+
+    // Await timeout 2s
+    await new Promise(resolve => setTimeout(resolve, 2000));
+    for (let i = 0; i < keys.length; i++) {
+      try {
         const JobClass = _scripts.default[keys[i]];
         const key = keys[i];
         const name = JobClass.name;
@@ -38,9 +41,9 @@ class MigrationService {
             timestamp: new Date().getTime()
           });
         }
+      } catch (error) {
+        this.logger.error('Migration error: ', _scripts.default[keys[i]].name, error);
       }
-    } catch (error) {
-      this.logger.error('Migration error: ', error);
     }
     this.logger.log('Migration done.');
   }

package/cjs/services/migration-service/scripts/MigrateAuthUrls.js

@@ -0,0 +1,39 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _Base = _interopRequireDefault(require("@subwallet/extension-base/services/migration-service/Base"));
+// Copyright 2019-2022 @subwallet/extension-koni authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+class MigrateSettings extends _Base.default {
+  async run() {
+    try {
+      return new Promise(resolve => {
+        this.state.getAuthorize(value => {
+          if (value) {
+            const key = 'app.stellaswap.com';
+            const stellaSwap = value[key];
+            if (stellaSwap) {
+              stellaSwap.currentEvmNetworkKey = 'moonbeam';
+              value[key] = stellaSwap;
+              this.state.setAuthorize(value, () => {
+                resolve();
+              });
+            } else {
+              resolve();
+            }
+          } else {
+            resolve();
+          }
+        });
+      });
+    } catch (e) {
+      console.error(e);
+    }
+  }
+}
+exports.default = MigrateSettings;

package/cjs/services/migration-service/scripts/index.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = exports.EVERYTIME = void 0;
 var _AutoEnableChainsTokens = _interopRequireDefault(require("@subwallet/extension-base/services/migration-service/scripts/AutoEnableChainsTokens"));
+var _MigrateAuthUrls = _interopRequireDefault(require("@subwallet/extension-base/services/migration-service/scripts/MigrateAuthUrls"));
 var _MigrateImportedToken = _interopRequireDefault(require("@subwallet/extension-base/services/migration-service/scripts/MigrateImportedToken"));
 var _MigrateNetworkSettings = _interopRequireDefault(require("@subwallet/extension-base/services/migration-service/scripts/MigrateNetworkSettings"));
 var _MigrateSettings = _interopRequireDefault(require("@subwallet/extension-base/services/migration-service/scripts/MigrateSettings"));
@@ -20,7 +21,8 @@ var _default = {
   '1.0.1-20': _MigrateImportedToken.default,
   '1.0.1-30': _MigrateTransactionHistory.default,
   '1.0.1-40': _AutoEnableChainsTokens.default,
-  '1.0.1-50': _MigrateSettings.default
+  '1.0.1-50': _MigrateSettings.default,
+  '1.0.1-60': _MigrateAuthUrls.default
   // [`${EVERYTIME}-1`]: AutoEnableChainsTokens
 };
 exports.default = _default;

package/cjs/services/price-service/index.js

@@ -69,7 +69,6 @@ class PriceService {
     await this.eventService.waitAssetReady;
     this.status = _types.ServiceStatus.INITIALIZED;
     this.eventService.on('asset.updateState', eventHandler);
-    this.eventService.on('asset.updateState', eventHandler);
   }
   async loadData() {
     const data = await this.dbService.getPriceStore();

package/cjs/services/request-service/handler/AuthRequestHandler.js

@@ -298,5 +298,12 @@ class AuthRequestHandler {
       });
     });
   }
+  resetWallet() {
+    for (const request of Object.values(this.#authRequestsV2)) {
+      request.reject(new Error('Reset wallet'));
+    }
+    this.authSubjectV2.next([]);
+    this.setAuthorize({});
+  }
 }
 exports.default = AuthRequestHandler;

package/cjs/services/request-service/handler/EvmRequestHandler.js

@@ -209,5 +209,26 @@ class EvmRequestHandler {
     }
     return true;
   }
+  resetWallet() {
+    const confirmations = this.confirmationsQueueSubject.getValue();
+    for (const [type, requests] of Object.entries(confirmations)) {
+      for (const confirmation of Object.values(requests)) {
+        const {
+          id
+        } = confirmation;
+        const {
+          resolver
+        } = this.confirmationsPromiseMap[id];
+        if (!resolver || !confirmation) {
+          console.error('Not found confirmation', type, id);
+        } else {
+          resolver.reject(new Error('Reset wallet'));
+        }
+        delete this.confirmationsPromiseMap[id];
+        delete confirmations[type][id];
+      }
+    }
+    this.confirmationsQueueSubject.next(confirmations);
+  }
 }
 exports.default = EvmRequestHandler;

package/cjs/services/request-service/handler/MetadataRequestHandler.js

@@ -81,5 +81,11 @@ class MetadataRequestHandler {
       this.#requestService.popupOpen();
     });
   }
+  resetWallet() {
+    for (const request of Object.values(this.#metaRequests)) {
+      request.reject(new Error('Reset wallet'));
+    }
+    this.metaSubject.next([]);
+  }
 }
 exports.default = MetadataRequestHandler;

package/cjs/services/request-service/handler/SubstrateRequestHandler.js

@@ -101,5 +101,11 @@ class SubstrateRequestHandler {
       }
     });
   }
+  resetWallet() {
+    for (const request of Object.values(this.#substrateRequests)) {
+      request.reject(new Error('Reset wallet'));
+    }
+    this.signSubject.next([]);
+  }
 }
 exports.default = SubstrateRequestHandler;

package/cjs/services/request-service/index.js

@@ -166,5 +166,11 @@ class RequestService {
   get numRequests() {
     return this.numMetaRequests + this.numAuthRequests + this.numSubstrateRequests + this.numEvmRequests;
   }
+  resetWallet() {
+    this.#authRequestHandler.resetWallet();
+    this.#substrateRequestHandler.resetWallet();
+    this.#evmRequestHandler.resetWallet();
+    this.#metadataRequestHandler.resetWallet();
+  }
 }
 exports.default = RequestService;

package/cjs/services/setting-service/SettingService.js

@@ -18,15 +18,7 @@ class SettingService {
   getSettings(update) {
     this.settingsStore.get('Settings', value => {
       if (!value) {
-        update({
-          // language: 'en',
-          browserConfirmationType: _constants.DEFAULT_NOTIFICATION_TYPE,
-          // isShowZeroBalance: true,
-          isShowBalance: false,
-          accountAllLogo: '',
-          theme: _constants.DEFAULT_THEME,
-          camera: false
-        });
+        update(_constants.DEFAULT_SETTING);
       } else {
         update(value);
       }
@@ -35,5 +27,8 @@ class SettingService {
   setSettings(data, callback) {
     this.settingsStore.set('Settings', data, callback);
   }
+  resetWallet() {
+    this.settingsStore.set('Settings', _constants.DEFAULT_SETTING);
+  }
 }
 exports.default = SettingService;

package/cjs/services/setting-service/constants.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.DEFAULT_THEME = exports.DEFAULT_NOTIFICATION_TYPE = void 0;
+exports.DEFAULT_THEME = exports.DEFAULT_SETTING = exports.DEFAULT_NOTIFICATION_TYPE = void 0;
 var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
 // SPDX-License-Identifier: Apache-2.0
@@ -11,4 +11,14 @@ var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
 const DEFAULT_THEME = _KoniTypes.ThemeNames.DARK;
 exports.DEFAULT_THEME = DEFAULT_THEME;
 const DEFAULT_NOTIFICATION_TYPE = 'popup';
-exports.DEFAULT_NOTIFICATION_TYPE = DEFAULT_NOTIFICATION_TYPE;
+exports.DEFAULT_NOTIFICATION_TYPE = DEFAULT_NOTIFICATION_TYPE;
+const DEFAULT_SETTING = {
+  // language: 'en',
+  browserConfirmationType: DEFAULT_NOTIFICATION_TYPE,
+  // isShowZeroBalance: true,
+  isShowBalance: false,
+  accountAllLogo: '',
+  theme: DEFAULT_THEME,
+  camera: false
+};
+exports.DEFAULT_SETTING = DEFAULT_SETTING;

package/cjs/services/storage-service/DatabaseService.js

@@ -256,5 +256,19 @@ class DatabaseService {
   async getNominatorMetadata() {
     return this.stores.nominatorMetadata.getAll();
   }
+  async resetWallet(resetAll) {
+    return new Promise((resolve, reject) => {
+      const stores = [this.stores.balance, this.stores.nft, this.stores.nftCollection, this.stores.crowdloan, this.stores.staking, this.stores.transaction, this.stores.nominatorMetadata];
+      if (resetAll) {
+        stores.push(this.stores.chain, this.stores.asset);
+      }
+      const promises = stores.map(store => store.clear());
+      Promise.all(promises).then(() => {
+        resolve();
+      }).catch(e => {
+        reject(e);
+      });
+    });
+  }
 }
 exports.default = DatabaseService;

package/cjs/services/storage-service/databases/index.js

@@ -13,7 +13,7 @@ const DEFAULT_DATABASE = 'SubWalletDB_v2';
 class KoniDatabase extends _dexie.default {
   constructor() {
     let name = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : DEFAULT_DATABASE;
-    let schemaVersion = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 10;
+    let schemaVersion = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 11;
     super(name);
     this.schemaVersion = schemaVersion;
     this.conditionalVersion(1, {

package/cjs/services/storage-service/db-stores/BaseStore.js

@@ -25,5 +25,8 @@ class BaseStore {
   remove(record) {
     return this.table.delete(record);
   }
+  clear() {
+    return this.table.clear();
+  }
 }
 exports.default = BaseStore;

package/cjs/services/transaction-service/index.js

@@ -798,5 +798,8 @@ class TransactionService {
     });
     return emitter;
   }
+  resetWallet() {
+    this.transactionSubject.next({});
+  }
 }
 exports.default = TransactionService;

package/koni/api/staking/bonding/amplitude.js

@@ -42,9 +42,16 @@ export async function getAmplitudeNominatorMetadata(chainInfo, address, substrat
   const minDelegatorStake = chainApi.api.consts.parachainStaking.minDelegatorStake.toString();
   const delegatorState = _delegatorState.toPrimitive();
   const unstakingInfo = _unstakingInfo.toPrimitive();
-  console.log('unstakingInfo ampe', unstakingInfo, !!unstakingInfo);
   if (!delegatorState && !unstakingInfo) {
-    return;
+    return {
+      chain: chainInfo.slug,
+      type: StakingType.NOMINATED,
+      address,
+      status: StakingStatus.NOT_STAKING,
+      activeStake: '0',
+      nominations: [],
+      unstakings: []
+    };
   }
   let activeStake = '0';
   if (delegatorState) {

package/koni/api/staking/bonding/astar.js

@@ -109,7 +109,15 @@ export async function getAstarNominatorMetadata(chainInfo, address, substrateApi
     });
   }
   if (nominationList.length === 0 && unstakingList.length === 0) {
-    return;
+    return {
+      chain: chainInfo.slug,
+      type: StakingType.NOMINATED,
+      address,
+      status: StakingStatus.NOT_STAKING,
+      activeStake: '0',
+      nominations: [],
+      unstakings: []
+    };
   }
   const stakingStatus = getStakingStatusByNominations(bnTotalActiveStake, nominationList);
   return {

package/koni/api/staking/bonding/paraChain.js

@@ -42,7 +42,7 @@ export function validateParaChainBondingCondition(chainInfo, amount, selectedCol
   const bnChainMinStake = new BN(chainStakingMetadata.minStake || '0');
   const bnCollatorMinStake = new BN(selectedCollator.minBond || '0');
   const bnMinStake = bnCollatorMinStake > bnChainMinStake ? bnCollatorMinStake : bnChainMinStake;
-  if (!nominatorMetadata) {
+  if (!nominatorMetadata || nominatorMetadata.status === StakingStatus.NOT_STAKING) {
     if (!bnTotalStake.gte(bnMinStake)) {
       errors.push(new TransactionError(StakingTxErrorType.NOT_ENOUGH_MIN_STAKE));
     }
@@ -130,7 +130,15 @@ export async function getParaChainNominatorMetadata(chainInfo, address, substrat
   const _delegatorState = await chainApi.api.query.parachainStaking.delegatorState(address);
   const delegatorState = _delegatorState.toPrimitive();
   if (!delegatorState) {
-    return;
+    return {
+      chain: chainInfo.slug,
+      type: StakingType.NOMINATED,
+      address,
+      status: StakingStatus.NOT_STAKING,
+      activeStake: '0',
+      nominations: [],
+      unstakings: []
+    };
   }
   let bnTotalActiveStake = BN_ZERO;
   await Promise.all(delegatorState.delegations.map(async delegation => {

package/koni/api/staking/bonding/relayChain.js

@@ -34,7 +34,7 @@ export function validatePoolBondingCondition(chainInfo, amount, selectedPool, ad
   if (nominatorMetadata) {
     const bnCurrentActiveStake = new BN(nominatorMetadata.activeStake);
     bnTotalStake = bnTotalStake.add(bnCurrentActiveStake);
-    if (!bnCurrentActiveStake.gt(BN_ZERO)) {
+    if (nominatorMetadata.unstakings.length > 0) {
       errors.push(new TransactionError(StakingTxErrorType.EXIST_UNSTAKING_REQUEST));
     }
   }
@@ -47,7 +47,7 @@ export function validateRelayBondingCondition(chainInfo, amount, selectedValidat
   const errors = [];
   let bnTotalStake = new BN(amount);
   const bnMinStake = new BN(chainStakingMetadata.minStake);
-  if (!nominatorMetadata) {
+  if (!nominatorMetadata || nominatorMetadata.status === StakingStatus.NOT_STAKING) {
     if (!bnTotalStake.gte(bnMinStake)) {
       errors.push(new TransactionError(StakingTxErrorType.NOT_ENOUGH_MIN_STAKE));
     }
@@ -145,7 +145,15 @@ export async function getRelayChainNominatorMetadata(chainInfo, address, substra
   const currentEra = _currentEra.toString();
   const bonded = _bonded.toHuman();
   if (!ledger) {
-    return;
+    return {
+      chain,
+      type: StakingType.NOMINATED,
+      status: StakingStatus.NOT_STAKING,
+      address: address,
+      activeStake: '0',
+      nominations: [],
+      unstakings: []
+    };
   }
   const activeStake = ledger.active.toString();
   const nominationList = [];
@@ -225,7 +233,16 @@ export async function getRelayChainPoolMemberMetadata(chainInfo, address, substr
   const poolMemberInfo = _poolMemberInfo.toPrimitive();
   const currentEra = _currentEra.toString();
   if (!poolMemberInfo) {
-    return;
+    return {
+      chain: chainInfo.slug,
+      type: StakingType.POOLED,
+      address,
+      status: StakingStatus.NOT_STAKING,
+      activeStake: '0',
+      nominations: [],
+      // can only join 1 pool at a time
+      unstakings: []
+    };
   }
   let stakingStatus = StakingStatus.NOT_EARNING;
   const _poolMetadata = await chainApi.api.query.nominationPools.metadata(poolMemberInfo.poolId);

package/koni/background/handlers/Extension.d.ts

@@ -169,6 +169,7 @@ export default class KoniExtension {
     private keyringUnlock;
     private keyringLock;
     private keyringExportMnemonic;
+    private resetWallet;
     private signingApprovePasswordV2;
     private derivationCreateMultiple;
     private derivationCreateV3;