@subwallet/extension-base 1.0.2-2 → 1.0.3-0

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

@@ -31,7 +31,6 @@ export default class KoniState {
     private readonly unsubscriptionMap;
     private readonly accountRefStore;
     private externalRequest;
-    private serviceInfoSubject;
     private balanceMap;
     private balanceSubject;
     private crowdloanMap;
@@ -109,8 +108,8 @@ export default class KoniState {
     subscribeNftCollection(): import("dexie").Observable<NftCollection[]>;
     resetNft(newAddress: string): void;
     updateNftData(network: string, nftData: NftItem, address: string, callback?: (nftData: NftItem) => void): void;
-    removeNfts(chain: string, address: string, collectionId: string, nftIds: string[]): import("dexie").PromiseExtended<number>;
     deleteNftCollection(chain: string, collectionId: string): Promise<void>;
+    cleanUpNfts(chain: string, owner: string, collectionId: string[], nftIds: string[], ownNothing?: boolean): void;
     getNft(): Promise<NftJson | undefined>;
     subscribeNft(): Subject<NftJson>;
     resetStakingReward(): void;
@@ -141,7 +140,7 @@ export default class KoniState {
     private removeInactiveChainBalances;
     getBalance(reset?: boolean): BalanceJson;
     getStoredBalance(address: string): Promise<Record<string, BalanceItem>>;
-    switchAccount(newAddress: string): Promise<void>;
+    handleSwitchAccount(newAddress: string): Promise<void>;
     resetBalanceMap(newAddress: string): Promise<void>;
     resetCrowdloanMap(newAddress: string): Promise<void>;
     resetStaking(newAddress: string): void;
@@ -153,7 +152,6 @@ export default class KoniState {
     setCrowdloanItem(networkKey: string, item: CrowdloanItem): void;
     private updateCrowdloanStore;
     subscribeCrowdloan(): Subject<CrowdloanJson>;
-    getAllPriceIds(): string[];
     getSmartContractNfts(): _ChainAsset[];
     getChainInfoMap(): Record<string, _ChainInfo>;
     getChainStateMap(): Record<string, _ChainState>;
@@ -182,7 +180,6 @@ export default class KoniState {
     disableChain(chainSlug: string): Promise<boolean>;
     enableChain(chainSlug: string, enableTokens?: boolean): Promise<boolean>;
     resetDefaultChains(): boolean;
-    updateNetworkStatus(networkKey: string, status: _ChainConnectionStatus): void;
     getSubstrateApiMap(): Record<string, import("@subwallet/extension-base/services/chain-service/types")._SubstrateApi>;
     getSubstrateApi(networkKey: string): import("@subwallet/extension-base/services/chain-service/types")._SubstrateApi;
     getEvmApiMap(): Record<string, import("@subwallet/extension-base/services/chain-service/types")._EvmApi>;
@@ -190,7 +187,6 @@ export default class KoniState {
     getApiMap(): ApiMap;
     refreshSubstrateApi(key: string): boolean;
     refreshWeb3Api(key: string): void;
-    subscribeServiceInfo(): Subject<ServiceInfo>;
     getServiceInfo(): ServiceInfo;
     getExternalRequestMap(): Record<string, ExternalRequestPromise>;
     setExternalRequestMap(id: string, value: ExternalRequestPromise): void;
@@ -219,8 +215,11 @@ export default class KoniState {
     wakeup(): Promise<void>;
     cancelSubscription(id: string): boolean;
     createUnsubscriptionHandle(id: string, unsubscribe: () => void): void;
+    updateChainConnectionStatus(chain: string, status: _ChainConnectionStatus): void;
     autoEnableChains(addresses: string[]): Promise<void>;
     onAccountAdd(): void;
     onAccountRemove(): void;
+    reloadNft(): Promise<boolean>;
+    reloadStaking(): Promise<boolean>;
 }
 export {};

package/koni/background/handlers/State.js

@@ -27,7 +27,6 @@ import AccountRefStore from '@subwallet/extension-base/stores/AccountRef';
 import { isContractAddress, parseContractInput } from '@subwallet/extension-base/utils/eth/parseTransaction';
 import { decodePair } from '@subwallet/keyring/pair/decode';
 import { keyring } from '@subwallet/ui-keyring';
-import { accounts } from '@subwallet/ui-keyring/observable/accounts';
 import SimpleKeyring from 'eth-simple-keyring';
 import { Subject } from 'rxjs';
 import { assert, BN, hexStripPrefix, hexToU8a, isHex, logger as createLogger, u8aToHex } from '@polkadot/util';
@@ -59,7 +58,6 @@ export default class KoniState {
   unsubscriptionMap = {};
   accountRefStore = new AccountRefStore();
   externalRequest = {};
-  serviceInfoSubject = new Subject();
   balanceMap = {};
   balanceSubject = new Subject();
   crowdloanMap = generateDefaultCrowdloanMap();
@@ -85,10 +83,10 @@ export default class KoniState {
     this.notificationService = new NotificationService();
     this.chainService = new ChainService(this.dbService, this.eventService);
     this.settingService = new SettingService();
-    this.requestService = new RequestService(this.chainService, this.settingService);
+    this.requestService = new RequestService(this.chainService, this.settingService, this.keyringService);
     this.priceService = new PriceService(this.dbService, this.eventService, this.chainService);
     this.balanceService = new BalanceService(this.chainService);
-    this.historyService = new HistoryService(this.dbService, this.chainService, this.eventService);
+    this.historyService = new HistoryService(this.dbService, this.chainService, this.eventService, this.keyringService);
     this.transactionService = new TransactionService(this.chainService, this.eventService, this.requestService, this.balanceService, this.historyService, this.notificationService, this.dbService);
     this.migrationService = new MigrationService(this);
     this.subscription = new KoniSubscription(this, this.dbService);
@@ -213,6 +211,8 @@ export default class KoniState {
   onReady() {
     this.subscription.start();
     this.cron.start();
+    this.historyService.start().catch(console.error);
+    this.priceService.start().catch(console.error);
     this.ready = true;
     this.logger.log('State is ready');
   }
@@ -253,7 +253,7 @@ export default class KoniState {
     return this.requestService.getAuthList();
   }
   getAddressList(value = false) {
-    const addressList = Object.keys(accounts.subject.value);
+    const addressList = Object.keys(this.keyringService.accounts);
     return addressList.reduce((addressList, v) => ({
       ...addressList,
       [v]: value
@@ -296,7 +296,7 @@ export default class KoniState {
     return addresses;
   }
   async getPooledStakingRecordsByAddress(addresses) {
-    return await this.dbService.getPooledStakings(addresses, this.activeChainSlugs);
+    return this.dbService.getPooledStakings(addresses, this.activeChainSlugs);
   }
 
   // TODO: delete later
@@ -354,12 +354,12 @@ export default class KoniState {
     this.dbService.addNft(address, nftData).catch(e => this.logger.warn(e));
     callback && callback(nftData);
   }
-  removeNfts(chain, address, collectionId, nftIds) {
-    return this.dbService.removeNfts(chain, address, collectionId, nftIds);
-  }
   deleteNftCollection(chain, collectionId) {
     return this.dbService.deleteNftCollection(chain, collectionId);
   }
+  cleanUpNfts(chain, owner, collectionId, nftIds, ownNothing) {
+    this.dbService.cleanUpNft(chain, owner, collectionId, nftIds, ownNothing).catch(e => this.logger.warn(e));
+  }
   async getNft() {
     const addresses = this.getDecodedAddresses();
     if (!addresses.length) {
@@ -446,7 +446,7 @@ export default class KoniState {
     if (address === ALL_ACCOUNT_KEY) {
       const pairs = keyring.getAccounts();
       const pair = pairs[0];
-      const pairGenesisHash = pair.meta.genesisHash;
+      const pairGenesisHash = (pair === null || pair === void 0 ? void 0 : pair.meta.genesisHash) || '';
       if (pairs.length > 1 || !pair) {
         result.allGenesisHash = currentGenesisHash || undefined;
       } else {
@@ -531,7 +531,11 @@ export default class KoniState {
       isApproved
     }) => {
       if (isApproved) {
-        await this.upsertChainInfo(networkData);
+        if (networkData.mode === 'insert') {
+          await this.upsertChainInfo(networkData);
+        } else {
+          // TODO: update existed network (need more discussion)
+        }
         return null;
       } else {
         throw new EvmProviderError(EvmProviderErrorType.USER_REJECTED_REQUEST);
@@ -554,7 +558,8 @@ export default class KoniState {
           assetType: tokenInfo.type,
           metadata: _parseMetadataForSmartContractAsset(tokenInfo.contractAddress),
           multiChainAsset: null,
-          hasValue: _isChainTestNet(this.chainService.getChainInfoByKey(tokenInfo.originChain))
+          hasValue: _isChainTestNet(this.chainService.getChainInfoByKey(tokenInfo.originChain)),
+          icon: ''
         });
         return isApproved;
       } else {
@@ -656,7 +661,7 @@ export default class KoniState {
     const items = await this.dbService.stores.balance.getBalanceMapByAddress(address);
     return items || {};
   }
-  async switchAccount(newAddress) {
+  async handleSwitchAccount(newAddress) {
     await Promise.all([this.resetBalanceMap(newAddress), this.resetCrowdloanMap(newAddress)]);
   }
   async resetBalanceMap(newAddress) {
@@ -737,9 +742,6 @@ export default class KoniState {
   subscribeCrowdloan() {
     return this.crowdloanSubject;
   }
-  getAllPriceIds() {
-    return this.chainService.getAllPriceIds();
-  }
   getSmartContractNfts() {
     return this.chainService.getSmartContractNfts();
   }
@@ -797,7 +799,9 @@ export default class KoniState {
       await this.chainService.updateAssetSetting(tokenSlug, {
         visible: true
       });
-      this.eventService.emit('asset.update', tokenSlug);
+      this.eventService.emit('asset.updateState', tokenSlug);
+    } else {
+      this.eventService.emit('asset.updateState', tokenSlug);
     }
   }
   deleteCustomAssets(targetTokens) {
@@ -824,6 +828,7 @@ export default class KoniState {
       await this.chainService.updateAssetSetting(newNativeTokenSlug, {
         visible: true
       });
+      this.eventService.emit('asset.updateState', newNativeTokenSlug);
     }
     return true;
   }
@@ -866,13 +871,6 @@ export default class KoniState {
     const defaultChains = this.getDefaultNetworkKeys();
     return this.chainService.resetChainInfoMap(defaultChains);
   }
-  updateNetworkStatus(networkKey, status) {
-    const chainState = this.chainService.getChainStateByKey(networkKey);
-    if (chainState.connectionStatus === status) {
-      return;
-    }
-    this.chainService.setChainConnectionStatus(networkKey, status);
-  }
   getSubstrateApiMap() {
     return this.chainService.getSubstrateApiMap();
   }
@@ -898,9 +896,6 @@ export default class KoniState {
   refreshWeb3Api(key) {
     this.chainService.refreshEvmApi(key);
   }
-  subscribeServiceInfo() {
-    return this.serviceInfoSubject;
-  }
   getServiceInfo() {
     return {
       chainInfoMap: this.chainService.getChainInfoMap(),
@@ -998,7 +993,10 @@ export default class KoniState {
     if (!chainId) {
       return [undefined, undefined];
     }
-    const rs = Object.entries(this.chainService.getChainInfoMap()).find(([networkKey, chainInfo]) => _getEvmChainId(chainInfo) === chainId);
+    const rs = Object.entries(this.chainService.getChainInfoMap()).find(([networkKey, chainInfo]) => {
+      var _chainInfo$evmInfo;
+      return (chainInfo === null || chainInfo === void 0 ? void 0 : (_chainInfo$evmInfo = chainInfo.evmInfo) === null || _chainInfo$evmInfo === void 0 ? void 0 : _chainInfo$evmInfo.evmChainId) === chainId;
+    });
     if (rs) {
       return rs;
     } else {
@@ -1232,17 +1230,23 @@ export default class KoniState {
       account: account,
       canSign: true
     };
+    const eType = transaction.value ? ExtrinsicType.TRANSFER_BALANCE : ExtrinsicType.EVM_EXECUTE;
+    const transactionData = {
+      ...transaction
+    };
+    if (eType === ExtrinsicType.TRANSFER_BALANCE) {
+      // @ts-ignore
+      transactionData.tokenSlug = this.chainService.getNativeTokenInfo(networkKey).slug;
+    }
 
-    // Todo: Convert this to handle transaction
+    // Custom handle this instead of general handler transaction
     const transactionEmitter = await this.transactionService.addTransaction({
       transaction: requestPayload,
       address: requestPayload.from,
       chain: networkKey,
       url,
-      data: {
-        ...transaction
-      },
-      extrinsicType: transaction.value ? ExtrinsicType.TRANSFER_BALANCE : ExtrinsicType.EVM_EXECUTE,
+      data: transactionData,
+      extrinsicType: eType,
       chainType: ChainType.EVM
     });
 
@@ -1320,11 +1324,15 @@ export default class KoniState {
     this.cron.stop();
     this.subscription.stop();
     await this.pauseAllNetworks(undefined, 'IDLE mode');
+    await this.historyService.stop();
+    await this.priceService.stop();
   }
   async wakeup() {
     await this.resumeAllNetworks();
     this.cron.start();
     this.subscription.start();
+    await this.historyService.start();
+    await this.priceService.start();
   }
   cancelSubscription(id) {
     if (isSubscriptionRunning(id)) {
@@ -1339,6 +1347,9 @@ export default class KoniState {
   createUnsubscriptionHandle(id, unsubscribe) {
     this.unsubscriptionMap[id] = unsubscribe;
   }
+  updateChainConnectionStatus(chain, status) {
+    this.chainService.setChainConnectionStatus(chain, status);
+  }
   async autoEnableChains(addresses) {
     const assetMap = this.chainService.getAssetRegistry();
     const promiseList = addresses.map(address => {
@@ -1364,7 +1375,7 @@ export default class KoniState {
         var _currentAssetSettings;
         const chain = SUBSCAN_CHAIN_MAP_REVERSE[network];
         const chainInfo = chain ? chainMap[chain] : null;
-        const balanceIsEmpty = (!balance || balance === '0') && !locked && locked === '0' && (!bonded || bonded === '0');
+        const balanceIsEmpty = (!balance || balance === '0') && (!locked || locked === '0') && (!bonded || bonded === '0');
 
         // Cancel if chain is not supported or is testnet or balance is 0
         if (!chainInfo || chainInfo.isTestnet || balanceIsEmpty) {
@@ -1409,4 +1420,10 @@ export default class KoniState {
       stores.staking.removeAllByAddress(address).catch(console.error);
     });
   }
+  async reloadNft() {
+    return await this.cron.reloadNft();
+  }
+  async reloadStaking() {
+    return await this.cron.reloadStaking();
+  }
 }

package/koni/background/handlers/Tabs.js

@@ -13,7 +13,6 @@ import { PHISHING_PAGE_REDIRECT } from '@subwallet/extension-base/defaults';
 import { _generateCustomProviderKey } from '@subwallet/extension-base/services/chain-service/utils';
 import { canDerive } from '@subwallet/extension-base/utils';
 import keyring from '@subwallet/ui-keyring';
-import { accounts as accountsObservable } from '@subwallet/ui-keyring/observable/accounts';
 import Web3 from 'web3';
 import { checkIfDenied } from '@polkadot/phishing';
 import { assert, isNumber } from '@polkadot/util';
@@ -182,13 +181,13 @@ export default class KoniTabs {
     anyType
   }) {
     const authInfo = await this.getAuthInfo(url);
-    return transformAccountsV2(accountsObservable.subject.getValue(), anyType, authInfo, accountAuthType);
+    return transformAccountsV2(this.#koniState.keyringService.accounts, anyType, authInfo, accountAuthType);
   }
   accountsSubscribeV2(url, {
     accountAuthType
   }, id, port) {
     const cb = createSubscription(id, port);
-    const subscription = accountsObservable.subject.subscribe(accounts => {
+    const subscription = this.#koniState.keyringService.accountSubject.subscribe(accounts => {
       this.getAuthInfo(url).then(authInfo => {
         cb(transformAccountsV2(accounts, false, authInfo, accountAuthType));
       }).catch(console.error);
@@ -213,7 +212,7 @@ export default class KoniTabs {
   async getEvmCurrentAccount(url, getAll = false) {
     return await new Promise(resolve => {
       this.getAuthInfo(url).then(authInfo => {
-        const allAccounts = accountsObservable.subject.getValue();
+        const allAccounts = this.#koniState.keyringService.accounts;
         const accountList = transformAccountsV2(allAccounts, false, authInfo, 'evm').map(a => a.address);
         let accounts = [];
         const address = this.#koniState.keyringService.currentAccount.address;
@@ -250,18 +249,25 @@ export default class KoniTabs {
         slug
       } = currentEvmNetwork;
       const evmApi = this.#koniState.getEvmApi(slug);
-      const web3 = evmApi.api;
-      if (web3.currentProvider instanceof Web3.providers.WebsocketProvider) {
+      const web3 = evmApi === null || evmApi === void 0 ? void 0 : evmApi.api;
+      if ((web3 === null || web3 === void 0 ? void 0 : web3.currentProvider) instanceof Web3.providers.WebsocketProvider) {
         if (!web3.currentProvider.connected) {
           console.log(`[Web3] ${slug} is disconnected, trying to connect...`);
           this.#koniState.refreshWeb3Api(slug);
+          let checkingNum = 0;
           const poll = resolve => {
+            checkingNum += 1;
             if (web3.currentProvider.connected) {
               console.log(`Network [${slug}] is connected.`);
               resolve(true);
             } else {
               console.log(`Connecting to network [${slug}]`);
-              setTimeout(() => poll(resolve), 400);
+              if (checkingNum < 10) {
+                setTimeout(() => poll(resolve), 900);
+              } else {
+                console.log(`Max retry, stop checking [${slug}]`);
+                resolve(false);
+              }
             }
           };
           await new Promise(poll);
@@ -329,12 +335,16 @@ export default class KoniTabs {
       contractAddress: input.options.address,
       originChain: chain
     });
-    if (validate.isExist) {
-      throw new EvmProviderError(EvmProviderErrorType.INTERNAL_ERROR, 'Current token is existed');
-    } else if (validate.contractError) {
+
+    // Below code is comment because we will handle exited token in the ui-view
+    // if (validate.isExist) {
+    //   throw new EvmProviderError(EvmProviderErrorType.INTERNAL_ERROR, 'Current token is existed');
+    // } else
+    if (validate.contractError) {
       throw new EvmProviderError(EvmProviderErrorType.INVALID_PARAMS, 'Contract address is invalid');
     }
     const tokenInfo = {
+      slug: validate === null || validate === void 0 ? void 0 : validate.existedSlug,
       type: tokenType,
       name: validate.name,
       contractAddress: input.options.address,
@@ -357,16 +367,38 @@ export default class KoniTabs {
       } = input[0];
       if (chainId) {
         const chainIdNum = parseInt(chainId, 16);
-        const [networkKey] = this.#koniState.findNetworkKeyByChainId(chainIdNum);
-        if (networkKey) {
+        const [existedNetworkSlug, existedChainInfo] = this.#koniState.findNetworkKeyByChainId(chainIdNum);
+        if (existedNetworkSlug && existedChainInfo && existedChainInfo !== null && existedChainInfo !== void 0 && existedChainInfo.evmInfo) {
+          const evmInfo = existedChainInfo.evmInfo;
+          const substrateInfo = existedChainInfo.substrateInfo;
+          const chainState = this.#koniState.getChainStateByKey(existedNetworkSlug);
+          await this.#koniState.addNetworkConfirm(id, url, {
+            mode: 'update',
+            chainSpec: {
+              evmChainId: evmInfo.evmChainId,
+              decimals: evmInfo.decimals,
+              existentialDeposit: evmInfo.existentialDeposit,
+              genesisHash: (substrateInfo === null || substrateInfo === void 0 ? void 0 : substrateInfo.genesisHash) || '',
+              paraId: (substrateInfo === null || substrateInfo === void 0 ? void 0 : substrateInfo.paraId) || null,
+              addressPrefix: (substrateInfo === null || substrateInfo === void 0 ? void 0 : substrateInfo.addressPrefix) || 0
+            },
+            chainEditInfo: {
+              blockExplorer: blockExplorerUrls === null || blockExplorerUrls === void 0 ? void 0 : blockExplorerUrls[0],
+              slug: existedNetworkSlug,
+              currentProvider: chainState.currentProvider,
+              providers: existedChainInfo.providers,
+              symbol: evmInfo.symbol,
+              chainType: 'EVM',
+              name: existedChainInfo.name
+            }
+          });
           return await this.switchEvmChain(id, url, {
             method: 'wallet_switchEthereumChain',
             params: [{
               chainId
             }]
           });
-        }
-        if (rpcUrls && chainName) {
+        } else if (rpcUrls && chainName) {
           const filteredUrls = rpcUrls.filter(targetString => {
             let url;
             try {
@@ -407,6 +439,8 @@ export default class KoniTabs {
               name: chainInfo.name
             }
           });
+        } else {
+          throw new EvmProviderError(EvmProviderErrorType.INVALID_PARAMS, 'Invalid provider');
         }
       }
     }
@@ -661,9 +695,8 @@ export default class KoniTabs {
       if (e.code) {
         throw e;
       } else {
-        // @ts-ignore
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
-        throw new EvmProviderError(EvmProviderErrorType.INTERNAL_ERROR, e.message);
+        console.error(e);
+        throw new EvmProviderError(EvmProviderErrorType.INTERNAL_ERROR, e === null || e === void 0 ? void 0 : e.toString());
       }
     }
   }

package/koni/background/subscription.d.ts

@@ -1,4 +1,5 @@
 import { _ChainAsset, _ChainInfo } from '@subwallet/chain-list/types';
+import { ChainStakingMetadata } from '@subwallet/extension-base/background/KoniTypes';
 import { _ChainState, _EvmApi, _SubstrateApi } from '@subwallet/extension-base/services/chain-service/types';
 import DatabaseService from '@subwallet/extension-base/services/storage-service/DatabaseService';
 import KoniState from './handlers/State';
@@ -26,6 +27,7 @@ export declare class KoniSubscription {
     initNftSubscription(addresses: string[], substrateApiMap: Record<string, _SubstrateApi>, evmApiMap: Record<string, _EvmApi>, smartContractNfts: _ChainAsset[], chainInfoMap: Record<string, _ChainInfo>): void;
     subscribeStakingReward(address: string): Promise<void>;
     subscribeStakingRewardFastInterval(address: string): Promise<void>;
+    fetchingStakingFromApi(): Promise<Record<string, ChainStakingMetadata>>;
     fetchChainStakingMetadata(chainInfoMap: Record<string, _ChainInfo>, chainStateMap: Record<string, _ChainState>, substrateApiMap: Record<string, _SubstrateApi>): Promise<void>;
     fetchNominatorMetadata(currentAddress: string, chainInfoMap: Record<string, _ChainInfo>, chainStateMap: Record<string, _ChainState>, substrateApiMap: Record<string, _SubstrateApi>): Promise<void>;
 }

package/koni/background/subscription.js

@@ -11,6 +11,8 @@ import { getAmplitudeUnclaimedStakingReward } from '@subwallet/extension-base/ko
 import { nftHandler } from '@subwallet/extension-base/koni/background/handlers';
 import { _STAKING_CHAIN_GROUP } from '@subwallet/extension-base/services/chain-service/constants';
 import { _isChainEnabled, _isChainEvmCompatible, _isChainSupportSubstrateStaking, _isSubstrateRelayChain } from '@subwallet/extension-base/services/chain-service/utils';
+import { COMMON_RELOAD_EVENTS } from '@subwallet/extension-base/services/event-service/types';
+import axios from 'axios';
 import { logger as createLogger } from '@polkadot/util';
 import { isEthereumAddress } from '@polkadot/util-crypto';
 export class KoniSubscription {
@@ -58,30 +60,28 @@ export class KoniSubscription {
       this.subscribeBalancesAndCrowdloans(currentAddress, this.state.getChainInfoMap(), this.state.getChainStateMap(), this.state.getSubstrateApiMap(), this.state.getEvmApiMap());
       this.subscribeStakingOnChain(currentAddress, this.state.getSubstrateApiMap());
     }
-    if (!this.eventHandler) {
-      const reloadEvents = ['account.add', 'account.remove', 'account.updateCurrent', 'chain.add', 'chain.update', 'chain.enable', 'asset.update', 'asset.enable', 'transaction.done', 'transaction.failed'];
-      this.eventHandler = (events, eventTypes) => {
-        var _serviceInfo$currentA;
-        const serviceInfo = this.state.getServiceInfo();
-        const needReload = eventTypes.some(eT => reloadEvents.includes(eT));
-        if (!needReload) {
-          return;
-        }
-        this.logger.log('ServiceInfo updated, restarting...');
-        const address = (_serviceInfo$currentA = serviceInfo.currentAccountInfo) === null || _serviceInfo$currentA === void 0 ? void 0 : _serviceInfo$currentA.address;
-        if (!address) {
-          return;
-        }
-        this.subscribeBalancesAndCrowdloans(address, serviceInfo.chainInfoMap, serviceInfo.chainStateMap, serviceInfo.chainApiMap.substrate, serviceInfo.chainApiMap.evm);
-        this.subscribeStakingOnChain(address, serviceInfo.chainApiMap.substrate);
-      };
-      this.state.eventService.onLazy(this.eventHandler);
-    }
+    this.eventHandler = (events, eventTypes) => {
+      var _serviceInfo$currentA;
+      const serviceInfo = this.state.getServiceInfo();
+      const needReload = eventTypes.some(eventType => COMMON_RELOAD_EVENTS.includes(eventType));
+      if (!needReload) {
+        return;
+      }
+      this.logger.log('ServiceInfo updated, restarting...');
+      const address = (_serviceInfo$currentA = serviceInfo.currentAccountInfo) === null || _serviceInfo$currentA === void 0 ? void 0 : _serviceInfo$currentA.address;
+      if (!address) {
+        return;
+      }
+      this.subscribeBalancesAndCrowdloans(address, serviceInfo.chainInfoMap, serviceInfo.chainStateMap, serviceInfo.chainApiMap.substrate, serviceInfo.chainApiMap.evm);
+      this.subscribeStakingOnChain(address, serviceInfo.chainApiMap.substrate);
+    };
+    this.state.eventService.onLazy(this.eventHandler);
   }
   stop() {
     this.logger.log('Stopping subscription');
     if (this.eventHandler) {
       this.state.eventService.offLazy(this.eventHandler);
+      this.eventHandler = undefined;
     }
     this.stopAllSubscription();
   }
@@ -107,7 +107,7 @@ export class KoniSubscription {
     });
   }
   subscribeBalancesAndCrowdloans(address, chainInfoMap, chainStateMap, substrateApiMap, web3ApiMap, onlyRunOnFirstTime) {
-    this.state.switchAccount(address).then(() => {
+    this.state.handleSwitchAccount(address).then(() => {
       const addresses = this.state.getDecodedAddresses(address);
       if (!addresses.length) {
         return;
@@ -178,9 +178,7 @@ export class KoniSubscription {
     nftHandler.setDotSamaApiMap(substrateApiMap);
     nftHandler.setWeb3ApiMap(evmApiMap);
     nftHandler.setAddresses(addresses);
-    nftHandler.handleNfts(smartContractNfts, (...args) => this.state.updateNftData(...args), (...args) => this.state.setNftCollection(...args)).then(() => {
-      this.logger.log('nft state updated');
-    }).catch(this.logger.log);
+    nftHandler.handleNfts(smartContractNfts, (...args) => this.state.updateNftData(...args), (...args) => this.state.setNftCollection(...args), (...args) => this.state.cleanUpNfts(...args)).catch(this.logger.log);
   }
   async subscribeStakingReward(address) {
     const addresses = this.state.getDecodedAddresses(address);
@@ -197,7 +195,6 @@ export class KoniSubscription {
     });
     const result = await getNominationStakingRewardData(addresses, targetNetworkMap);
     this.state.updateStakingReward(result, 'slowInterval');
-    this.logger.log('Set staking reward state done', result);
   }
   async subscribeStakingRewardFastInterval(address) {
     const addresses = this.state.getDecodedAddresses(address);
@@ -226,13 +223,39 @@ export class KoniSubscription {
     const [poolingStakingRewards, amplitudeUnclaimedStakingRewards] = await Promise.all([getPoolingStakingRewardData(pooledAddresses, targetChainMap, this.state.getSubstrateApiMap()), getAmplitudeUnclaimedStakingReward(this.state.getSubstrateApiMap(), addresses, chainInfoMap, activeNetworks)]);
     const result = [...poolingStakingRewards, ...amplitudeUnclaimedStakingRewards];
     this.state.updateStakingReward(result, 'fastInterval');
-    this.logger.log('Set staking reward state with fast interval done', result);
+  }
+  async fetchingStakingFromApi() {
+    try {
+      const response = await axios.get('https://staking-data.subwallet.app/api/staking/get');
+      if (response.status === 200) {
+        return response.data;
+      }
+    } catch (e) {
+      this.logger.error(e);
+    }
+    return {};
   }
   async fetchChainStakingMetadata(chainInfoMap, chainStateMap, substrateApiMap) {
-    await Promise.all(Object.values(chainInfoMap).map(async chainInfo => {
+    const filteredChainInfoMap = {};
+    Object.values(chainInfoMap).forEach(chainInfo => {
       const chainState = chainStateMap[chainInfo.slug];
       if (chainState !== null && chainState !== void 0 && chainState.active && _isChainSupportSubstrateStaking(chainInfo)) {
-        const chainStakingMetadata = await getChainStakingMetadata(chainInfo.slug, substrateApiMap[chainInfo.slug]);
+        filteredChainInfoMap[chainInfo.slug] = chainInfo;
+      }
+    });
+    if (Object.values(filteredChainInfoMap).length === 0) {
+      return;
+    }
+
+    // Fetch data from helper API
+    const dataFromApi = await this.fetchingStakingFromApi();
+    await Promise.all(Object.values(filteredChainInfoMap).map(async chainInfo => {
+      // Use fetch API data if available
+      if (dataFromApi[chainInfo.slug]) {
+        this.state.updateChainStakingMetadata(dataFromApi[chainInfo.slug]);
+      } else {
+        console.warn('Not found staking data from api', chainInfo.slug);
+        const chainStakingMetadata = await getChainStakingMetadata(chainInfo, substrateApiMap[chainInfo.slug]);
         this.state.updateChainStakingMetadata(chainStakingMetadata);
       }
     }));
@@ -249,8 +272,7 @@ export class KoniSubscription {
     if (currentAddress === ALL_ACCOUNT_KEY) {
       addresses = await this.state.getStakingOwnersByChains(Object.keys(filteredChainInfoMap));
     }
-    const validAddresses = addresses.filter(address => !isEthereumAddress(address));
-    await Promise.all(validAddresses.map(async address => {
+    await Promise.all(addresses.map(async address => {
       const isEvmAddress = isEthereumAddress(address);
       await Promise.all(Object.values(filteredChainInfoMap).map(async chainInfo => {
         if (isEvmAddress && !_isChainEvmCompatible(chainInfo)) {