@subwallet/extension-base 1.0.4-1 → 1.0.5-2

package/background/KoniTypes.d.ts

@@ -290,11 +290,19 @@ export interface UiSettings {
     accountAllLogo: string;
     theme: ThemeNames;
     camera: boolean;
+    timeAutoLock: number;
+    enableChainPatrol: boolean;
 }
 export declare type RequestSettingsType = UiSettings;
 export declare type RequestCameraSettings = {
     camera: boolean;
 };
+export declare type RequestChangeTimeAutoLock = {
+    autoLockTime: number;
+};
+export declare type RequestChangeEnableChainPatrol = {
+    enable: boolean;
+};
 export interface RandomTestRequest {
     start: number;
     end: number;
@@ -411,6 +419,8 @@ export interface TransactionHistoryItem<ET extends ExtrinsicType = ExtrinsicType
     fee?: AmountData;
     explorerUrl?: string;
     additionalInfo?: TransactionAdditionalInfo<ET>;
+    startBlock?: number;
+    nonce?: number;
 }
 export interface SWError extends Error {
     code?: number;
@@ -434,6 +444,7 @@ export declare enum BasicTxErrorType {
     SEND_TRANSACTION_FAILED = "SEND_TRANSACTION_FAILED",
     INTERNAL_ERROR = "INTERNAL_ERROR",
     UNSUPPORTED = "UNSUPPORTED",
+    TIMEOUT = "TIMEOUT",
     NOT_ENOUGH_EXISTENTIAL_DEPOSIT = "NOT_ENOUGH_EXISTENTIAL_DEPOSIT"
 }
 export declare enum StakingTxErrorType {
@@ -1460,12 +1471,14 @@ export interface KoniRequestSignatures {
     'pri(accounts.subscribeAddresses)': [null, AddressBookInfo, AddressBookInfo];
     'pri(accounts.editContact)': [RequestEditContactAccount, boolean];
     'pri(accounts.deleteContact)': [RequestDeleteContactAccount, boolean];
-    'pri(settings.changeBalancesVisibility)': [null, boolean, UiSettings];
+    'pri(settings.changeBalancesVisibility)': [null, boolean];
     'pri(settings.subscribe)': [null, UiSettings, UiSettings];
     'pri(settings.saveAccountAllLogo)': [string, boolean, UiSettings];
     'pri(settings.saveTheme)': [ThemeNames, boolean, UiSettings];
     'pri(settings.saveBrowserConfirmationType)': [BrowserConfirmationType, boolean, UiSettings];
     'pri(settings.saveCamera)': [RequestCameraSettings, boolean];
+    'pri(settings.saveAutoLockTime)': [RequestChangeTimeAutoLock, boolean];
+    'pri(settings.saveEnableChainPatrol)': [RequestChangeEnableChainPatrol, boolean];
     'pri(settings.getLogoMaps)': [null, AllLogoMap];
     'pri(transaction.history.getSubscription)': [null, TransactionHistoryItem[], TransactionHistoryItem[]];
     'pri(transfer.checkReferenceCount)': [RequestTransferCheckReferenceCount, boolean];

package/background/KoniTypes.js

@@ -102,6 +102,7 @@ export let BasicTxErrorType;
   BasicTxErrorType["SEND_TRANSACTION_FAILED"] = "SEND_TRANSACTION_FAILED";
   BasicTxErrorType["INTERNAL_ERROR"] = "INTERNAL_ERROR";
   BasicTxErrorType["UNSUPPORTED"] = "UNSUPPORTED";
+  BasicTxErrorType["TIMEOUT"] = "TIMEOUT";
   BasicTxErrorType["NOT_ENOUGH_EXISTENTIAL_DEPOSIT"] = "NOT_ENOUGH_EXISTENTIAL_DEPOSIT";
 })(BasicTxErrorType || (BasicTxErrorType = {}));
 export let StakingTxErrorType;

package/background/errors/TransactionError.js

@@ -50,6 +50,10 @@ const defaultErrorMap = {
     message: 'This transaction is not supported',
     code: undefined
   },
+  [BasicTxErrorType.TIMEOUT]: {
+    message: 'Transaction timeout',
+    code: undefined
+  },
   [StakingTxErrorType.NOT_ENOUGH_MIN_STAKE]: {
     message: 'Not enough min stake',
     code: undefined

package/background/handlers/State.d.ts

@@ -83,7 +83,7 @@ export default class State {
     getMetaRequest(id: string): MetaRequest;
     getSignRequest(id: string): SignRequest;
     rpcListProviders(): Promise<ResponseRpcListProviders>;
-    rpcSend(request: RequestRpcSend, port: chrome.runtime.Port): Promise<JsonRpcResponse>;
+    rpcSend(request: RequestRpcSend, port: chrome.runtime.Port): Promise<JsonRpcResponse<unknown>>;
     rpcStartProvider(key: string, port: chrome.runtime.Port): Promise<ProviderMeta>;
     rpcSubscribe({ method, params, type }: RequestRpcSubscribe, cb: ProviderInterfaceCallback, port: chrome.runtime.Port): Promise<number | string>;
     rpcSubscribeConnected(_request: null, cb: ProviderInterfaceCallback, port: chrome.runtime.Port): void;

package/background/handlers/State.js

@@ -1,7 +1,7 @@
 // Copyright 2019-2022 @polkadot/extension-bg authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { DEFAULT_NOTIFICATION_TYPE, DEFAULT_THEME } from '@subwallet/extension-base/services/setting-service/constants';
+import { DEFAULT_SETTING } from '@subwallet/extension-base/services/setting-service/constants';
 import SettingsStore from '@subwallet/extension-base/stores/Settings';
 import { getId } from '@subwallet/extension-base/utils/getId';
 import { addMetadata, knownMetadata } from '@subwallet/extension-chains';
@@ -156,13 +156,7 @@ export default class State {
     this.settingsStore.get('Settings', value => {
       if (!value) {
         update({
-          // language: 'en',
-          browserConfirmationType: DEFAULT_NOTIFICATION_TYPE,
-          // isShowZeroBalance: true,
-          isShowBalance: false,
-          accountAllLogo: '',
-          theme: DEFAULT_THEME,
-          camera: false
+          ...DEFAULT_SETTING
         });
       } else {
         update(value);

package/background/handlers/subscriptions.js

@@ -22,7 +22,6 @@ export function isSubscriptionRunning(id) {
 // clear a previous subscriber
 export function unsubscribe(id) {
   if (subscriptions[id]) {
-    console.log(`Unsubscribing from ${id}`);
     delete subscriptions[id];
   } else {
     console.error(`Unable to unsubscribe from ${id}`);

package/background/types.d.ts

@@ -134,9 +134,9 @@ export interface RequestSignatures extends KoniRequestSignatures {
     'pub(metadata.provide)': [MetadataDef, boolean];
     'pub(phishing.redirectIfDenied)': [null, boolean];
     'pub(rpc.listProviders)': [void, ResponseRpcListProviders];
-    'pub(rpc.send)': [RequestRpcSend, JsonRpcResponse];
+    'pub(rpc.send)': [RequestRpcSend, JsonRpcResponse<unknown>];
     'pub(rpc.startProvider)': [string, ProviderMeta];
-    'pub(rpc.subscribe)': [RequestRpcSubscribe, number, JsonRpcResponse];
+    'pub(rpc.subscribe)': [RequestRpcSubscribe, number, JsonRpcResponse<unknown>];
     'pub(rpc.subscribeConnected)': [null, boolean, boolean];
     'pub(rpc.unsubscribe)': [RequestRpcUnsubscribe, boolean];
 }

package/cjs/background/KoniTypes.js

@@ -107,6 +107,7 @@ exports.BasicTxErrorType = BasicTxErrorType;
   BasicTxErrorType["SEND_TRANSACTION_FAILED"] = "SEND_TRANSACTION_FAILED";
   BasicTxErrorType["INTERNAL_ERROR"] = "INTERNAL_ERROR";
   BasicTxErrorType["UNSUPPORTED"] = "UNSUPPORTED";
+  BasicTxErrorType["TIMEOUT"] = "TIMEOUT";
   BasicTxErrorType["NOT_ENOUGH_EXISTENTIAL_DEPOSIT"] = "NOT_ENOUGH_EXISTENTIAL_DEPOSIT";
 })(BasicTxErrorType || (exports.BasicTxErrorType = BasicTxErrorType = {}));
 let StakingTxErrorType;

package/cjs/background/errors/TransactionError.js

@@ -55,6 +55,10 @@ const defaultErrorMap = {
     message: 'This transaction is not supported',
     code: undefined
   },
+  [_KoniTypes.BasicTxErrorType.TIMEOUT]: {
+    message: 'Transaction timeout',
+    code: undefined
+  },
   [_KoniTypes.StakingTxErrorType.NOT_ENOUGH_MIN_STAKE]: {
     message: 'Not enough min stake',
     code: undefined

package/cjs/background/handlers/State.js

@@ -181,13 +181,7 @@ class State {
     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
+          ..._constants.DEFAULT_SETTING
         });
       } else {
         update(value);

package/cjs/background/handlers/subscriptions.js

@@ -30,7 +30,6 @@ function isSubscriptionRunning(id) {
 // clear a previous subscriber
 function unsubscribe(id) {
   if (subscriptions[id]) {
-    console.log(`Unsubscribing from ${id}`);
     delete subscriptions[id];
   } else {
     console.error(`Unable to unsubscribe from ${id}`);

package/cjs/constants/index.js

@@ -17,14 +17,14 @@ var _exportNames = {
   CRON_GET_API_MAP_STATUS: true,
   CRON_REFRESH_CHAIN_STAKING_METADATA: true,
   CRON_REFRESH_CHAIN_NOMINATOR_METADATA: true,
+  CRON_RECOVER_HISTORY_INTERVAL: true,
   ALL_ACCOUNT_KEY: true,
   ALL_NETWORK_KEY: true,
   ALL_GENESIS_HASH: true,
   IGNORE_GET_SUBSTRATE_FEATURES_LIST: true,
-  IGNORE_QR_SIGNER: true,
-  DEFAULT_TIME_AUTO_LOCK: true
+  IGNORE_QR_SIGNER: true
 };
-exports.SUB_TOKEN_REFRESH_BALANCE_INTERVAL = exports.IGNORE_QR_SIGNER = exports.IGNORE_GET_SUBSTRATE_FEATURES_LIST = exports.DEFAULT_TIME_AUTO_LOCK = exports.CRON_REFRESH_STAKING_REWARD_INTERVAL = exports.CRON_REFRESH_STAKING_REWARD_FAST_INTERVAL = exports.CRON_REFRESH_PRICE_INTERVAL = exports.CRON_REFRESH_NFT_INTERVAL = exports.CRON_REFRESH_HISTORY_INTERVAL = exports.CRON_REFRESH_CHAIN_STAKING_METADATA = exports.CRON_REFRESH_CHAIN_NOMINATOR_METADATA = exports.CRON_GET_API_MAP_STATUS = exports.CRON_AUTO_RECOVER_WEB3_INTERVAL = exports.CRON_AUTO_RECOVER_DOTSAMA_INTERVAL = exports.ASTAR_REFRESH_BALANCE_INTERVAL = exports.ALL_NETWORK_KEY = exports.ALL_GENESIS_HASH = exports.ALL_ACCOUNT_KEY = exports.ACALA_REFRESH_CROWDLOAN_INTERVAL = void 0;
+exports.SUB_TOKEN_REFRESH_BALANCE_INTERVAL = exports.IGNORE_QR_SIGNER = exports.IGNORE_GET_SUBSTRATE_FEATURES_LIST = exports.CRON_REFRESH_STAKING_REWARD_INTERVAL = exports.CRON_REFRESH_STAKING_REWARD_FAST_INTERVAL = exports.CRON_REFRESH_PRICE_INTERVAL = exports.CRON_REFRESH_NFT_INTERVAL = exports.CRON_REFRESH_HISTORY_INTERVAL = exports.CRON_REFRESH_CHAIN_STAKING_METADATA = exports.CRON_REFRESH_CHAIN_NOMINATOR_METADATA = exports.CRON_RECOVER_HISTORY_INTERVAL = exports.CRON_GET_API_MAP_STATUS = exports.CRON_AUTO_RECOVER_WEB3_INTERVAL = exports.CRON_AUTO_RECOVER_DOTSAMA_INTERVAL = exports.ASTAR_REFRESH_BALANCE_INTERVAL = exports.ALL_NETWORK_KEY = exports.ALL_GENESIS_HASH = exports.ALL_ACCOUNT_KEY = exports.ACALA_REFRESH_CROWDLOAN_INTERVAL = void 0;
 var _staking = require("./staking");
 Object.keys(_staking).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
@@ -66,6 +66,8 @@ const CRON_REFRESH_CHAIN_STAKING_METADATA = 900000;
 exports.CRON_REFRESH_CHAIN_STAKING_METADATA = CRON_REFRESH_CHAIN_STAKING_METADATA;
 const CRON_REFRESH_CHAIN_NOMINATOR_METADATA = 1800000;
 exports.CRON_REFRESH_CHAIN_NOMINATOR_METADATA = CRON_REFRESH_CHAIN_NOMINATOR_METADATA;
+const CRON_RECOVER_HISTORY_INTERVAL = 30000;
+exports.CRON_RECOVER_HISTORY_INTERVAL = CRON_RECOVER_HISTORY_INTERVAL;
 const ALL_ACCOUNT_KEY = 'ALL';
 exports.ALL_ACCOUNT_KEY = ALL_ACCOUNT_KEY;
 const ALL_NETWORK_KEY = 'all';
@@ -75,6 +77,4 @@ exports.ALL_GENESIS_HASH = ALL_GENESIS_HASH;
 const IGNORE_GET_SUBSTRATE_FEATURES_LIST = ['astarEvm', 'ethereum', 'ethereum_goerli', 'binance', 'binance_test', 'boba_rinkeby', 'boba', 'bobabase', 'bobabeam'];
 exports.IGNORE_GET_SUBSTRATE_FEATURES_LIST = IGNORE_GET_SUBSTRATE_FEATURES_LIST;
 const IGNORE_QR_SIGNER = [];
-exports.IGNORE_QR_SIGNER = IGNORE_QR_SIGNER;
-const DEFAULT_TIME_AUTO_LOCK = 15 * 60 * 1000;
-exports.DEFAULT_TIME_AUTO_LOCK = DEFAULT_TIME_AUTO_LOCK;
+exports.IGNORE_QR_SIGNER = IGNORE_QR_SIGNER;

package/cjs/koni/api/coingecko.js

@@ -15,9 +15,6 @@ const getTokenPrice = async function (priceIds) {
     // const inverseMap: Record<string, string> = {};
     const idStr = priceIds.join(',');
     const res = await _axios.default.get(`https://api.coingecko.com/api/v3/coins/markets?vs_currency=${currency}&per_page=1000&ids=${idStr}`);
-    if (res.status !== 200) {
-      console.warn('Failed to get token price');
-    }
     const responseData = res.data;
     const priceMap = {};
     const price24hMap = {};
@@ -39,7 +36,7 @@ const getTokenPrice = async function (priceIds) {
       price24hMap
     };
   } catch (err) {
-    console.error('Failed to get token price', err);
+    console.error(err);
     throw err;
   }
 };

package/cjs/koni/api/dotsama/balance.js

@@ -119,11 +119,13 @@ async function subscribeWithSystemAccountPallet(addresses, chainInfo, networkAPI
       }
     }
     balances.forEach(balance => {
-      var _balance$data, _balance$data$free, _balance$data2, _balance$data2$reserv, _balance$data3, _balance$data3$miscFr, _balance$data4, _balance$data4$feeFro;
+      var _balance$data, _balance$data$free, _balance$data2, _balance$data2$reserv, _balance$data3, _balance$data3$miscFr, _balance$data4, _balance$data4$frozen, _balance$data5, _balance$data5$feeFro;
       total = total.add(((_balance$data = balance.data) === null || _balance$data === void 0 ? void 0 : (_balance$data$free = _balance$data.free) === null || _balance$data$free === void 0 ? void 0 : _balance$data$free.toBn()) || new _util.BN(0)); // reserved is seperated
       reserved = reserved.add(((_balance$data2 = balance.data) === null || _balance$data2 === void 0 ? void 0 : (_balance$data2$reserv = _balance$data2.reserved) === null || _balance$data2$reserv === void 0 ? void 0 : _balance$data2$reserv.toBn()) || new _util.BN(0));
-      miscFrozen = miscFrozen.add(((_balance$data3 = balance.data) === null || _balance$data3 === void 0 ? void 0 : (_balance$data3$miscFr = _balance$data3.miscFrozen) === null || _balance$data3$miscFr === void 0 ? void 0 : _balance$data3$miscFr.toBn()) || new _util.BN(0));
-      feeFrozen = feeFrozen.add(((_balance$data4 = balance.data) === null || _balance$data4 === void 0 ? void 0 : (_balance$data4$feeFro = _balance$data4.feeFrozen) === null || _balance$data4$feeFro === void 0 ? void 0 : _balance$data4$feeFro.toBn()) || new _util.BN(0));
+      // @ts-ignore
+      // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access
+      miscFrozen = miscFrozen.add(((_balance$data3 = balance.data) === null || _balance$data3 === void 0 ? void 0 : (_balance$data3$miscFr = _balance$data3.miscFrozen) === null || _balance$data3$miscFr === void 0 ? void 0 : _balance$data3$miscFr.toBn()) || (balance === null || balance === void 0 ? void 0 : (_balance$data4 = balance.data) === null || _balance$data4 === void 0 ? void 0 : (_balance$data4$frozen = _balance$data4.frozen) === null || _balance$data4$frozen === void 0 ? void 0 : _balance$data4$frozen.toBn()) || new _util.BN(0)); // TODO: update frozen
+      feeFrozen = feeFrozen.add(((_balance$data5 = balance.data) === null || _balance$data5 === void 0 ? void 0 : (_balance$data5$feeFro = _balance$data5.feeFrozen) === null || _balance$data5$feeFro === void 0 ? void 0 : _balance$data5$feeFro.toBn()) || new _util.BN(0));
     });
     let locked = reserved.add(miscFrozen);
     total = total.add(reserved); // total = free + reserved
@@ -169,7 +171,7 @@ function subscribeERC20Interval(addresses, chain, evmApiMap, callBack) {
           state: _KoniTypes.APIItemState.READY
         });
       } catch (err) {
-        console.log('There is a problem fetching ' + tokenInfo.slug + ' token balance', err);
+        console.log(tokenInfo.slug, err);
       }
     });
   };
@@ -208,7 +210,7 @@ function subscribePSP22Balance(addresses, chain, api, callBack) {
           state: _KoniTypes.APIItemState.READY
         });
       } catch (err) {
-        console.warn('Problem fetching ' + tokenInfo.slug + ' PSP-22 token balance', err); // TODO: error createType
+        console.warn(tokenInfo.slug, err); // TODO: error createType
       }
     });
   };

package/cjs/koni/api/dotsama/crowdloan.js

@@ -46,10 +46,6 @@ const subscribeAcalaContributeInterval = (polkadotAddresses, paraState, callback
       let contribute = new _util.BN(0);
       resList.forEach(res => {
         var _res$data$data, _res$data$data$acala, _res$data$data$acala$;
-        if (res.status !== 200) {
-          console.warn('Failed to get Acala, Karura crowdloan contribute');
-        }
-
         // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-unsafe-argument
         contribute = contribute.add(new _util.BN(((_res$data$data = res.data.data) === null || _res$data$data === void 0 ? void 0 : (_res$data$data$acala = _res$data$data.acala) === null || _res$data$data$acala === void 0 ? void 0 : (_res$data$data$acala$ = _res$data$data$acala[0]) === null || _res$data$data$acala$ === void 0 ? void 0 : _res$data$data$acala$.totalDOTLocked) || '0'));
       });

package/cjs/koni/api/dotsama/transfer.js

@@ -94,7 +94,6 @@ async function checkSupportTransfer(networkKey, tokenInfo, substrateApiMap, chai
   return result;
 }
 const createTransferExtrinsic = async _ref => {
-  var _transfer;
   let {
     from,
     networkKey,
@@ -151,9 +150,6 @@ const createTransferExtrinsic = async _ref => {
       transfer = api.tx.balances.transfer(to, new _util.BN(value));
     }
   }
-
-  // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access
-  console.log('transfer extrinsic: ', (_transfer = transfer) === null || _transfer === void 0 ? void 0 : _transfer.toHex());
   return [transfer, transferAmount || value];
 };
 exports.createTransferExtrinsic = createTransferExtrinsic;

package/cjs/koni/api/nft/acala_nft/index.js

@@ -120,7 +120,7 @@ class AcalaNftApi extends _nft.BaseNftApi {
       }));
       params.cleanUpNfts(this.chain, address, collectionIds, nftIds);
     } catch (e) {
-      console.error('Failed to fetch acala nft', e);
+      console.error(`${this.chain}`, e);
     }
   }
   async handleNfts(params) {

package/cjs/koni/api/nft/bit.country/index.js

@@ -118,7 +118,7 @@ class BitCountryNftApi extends _nft.BaseNftApi {
       }));
       params.cleanUpNfts(this.chain, address, collectionIds, nftIds);
     } catch (e) {
-      console.error('Failed to fetch bit.country nft', e);
+      console.error(`${this.chain}`, e);
     }
   }
   async handleNfts(params) {

package/cjs/koni/api/nft/evm_nft/index.js

@@ -113,7 +113,6 @@ class EvmNftApi extends _nft.BaseNftApi {
               const resp = await (0, _crossFetch.default)(detailUrl);
               const itemDetail = resp && resp.ok && (await resp.json());
               if (!itemDetail) {
-                console.warn((resp === null || resp === void 0 ? void 0 : resp.statusText) || `Cannot fetch NFT id [${nftId}] from Web3.`);
                 return;
               }
               const parsedItem = this.parseMetadata(itemDetail);
@@ -130,13 +129,13 @@ class EvmNftApi extends _nft.BaseNftApi {
                 ownItem = true;
               }
             } catch (e) {
-              console.error(`error parsing item for ${this.chain} nft`, e);
+              console.error(`${this.chain}`, e);
             }
           }
         }));
         nftOwnerMap[address] = nftIds;
       } catch (e) {
-        console.error('EVM NFT error', e);
+        console.error(`${this.chain}`, e);
       }
     }));
     if (ownItem) {

package/cjs/koni/api/nft/index.js

@@ -126,10 +126,9 @@ class NftHandler {
           }
         });
         this.needSetupApi = false;
-        // console.log(`${this.handlers.length} nft handlers connected`, this.handlers);
       }
     } catch (e) {
-      console.error('error setting up nft handlers', e);
+      console.error(e);
     }
   }
   async handleNfts(nftContracts, updateItem, updateCollection, cleanUpNfts) {

package/cjs/koni/api/nft/karura_nft/index.js

@@ -126,7 +126,7 @@ class KaruraNftApi extends _nft.BaseNftApi {
       }));
       params.cleanUpNfts(this.chain, address, collectionIds, nftIds);
     } catch (e) {
-      console.error('Failed to fetch karura nft', e);
+      console.error(`${this.chain}`, e);
     }
   }
   async handleNfts(params) {

package/cjs/koni/api/nft/quartz_nft/index.js

@@ -188,7 +188,7 @@ class QuartzNftApi extends _nft.BaseNftApi {
         }
       }));
     } catch (e) {
-      console.error('Failed to fetch quartz nft', e);
+      console.error(`${this.chain}`, e);
     }
   }
   async handleNfts(params) {

package/cjs/koni/api/nft/rmrk_nft/index.js

@@ -200,7 +200,6 @@ class RmrkNftApi extends _nft.BaseNftApi {
             return {};
           }
         } catch (e) {
-          console.error('error fetching collection info', url);
           return {};
         }
       }));
@@ -227,7 +226,7 @@ class RmrkNftApi extends _nft.BaseNftApi {
             };
           }
         } catch (e) {
-          console.error('error parsing JSON for RMRK ', item.url, e);
+          console.error(item.url, e);
         }
       }));
       allCollections.forEach(item => {
@@ -252,7 +251,7 @@ class RmrkNftApi extends _nft.BaseNftApi {
       const allNftIds = allNfts.map(nft => nft === null || nft === void 0 ? void 0 : nft.id);
       params.cleanUpNfts(this.chain, address, allCollectionIds, allNftIds);
     } catch (e) {
-      console.error('Failed to fetch rmrk nft', e);
+      console.error(`${this.chain}`, e);
     }
   }
   async handleNfts(params) {

package/cjs/koni/api/nft/statemine_nft/index.js

@@ -126,7 +126,7 @@ class StatemineNftApi extends _nft.BaseNftApi {
       }));
       params.cleanUpNfts(this.chain, address, collectionIds, nftIds);
     } catch (e) {
-      console.error('Failed to fetch statemine nft', e);
+      console.error(`${this.chain}`, e);
     }
   }
   async handleNfts(params) {

package/cjs/koni/api/nft/transfer.js

@@ -24,7 +24,7 @@ function acalaGetExtrinsic(substrateApi, senderAddress, recipientAddress, params
     const collectionId = params.collectionId;
     return substrateApi.api.tx.nft.transfer(recipientAddress, [collectionId, itemId]);
   } catch (e) {
-    console.error('error handling acala transfer nft', e);
+    console.error(e);
     return null;
   }
 }
@@ -37,7 +37,7 @@ function rmrkGetExtrinsic(substrateApi, senderAddress, recipientAddress, params)
     const parsedRemark = remark.concat(recipientAddress.replace(/\\s/g, ''));
     return substrateApi.api.tx.system.remark(parsedRemark);
   } catch (e) {
-    console.error('error handling rmrk transfer nft', e);
+    console.error(e);
     return null;
   }
 }
@@ -49,7 +49,7 @@ function uniqueGetExtrinsic(substrateApi, senderAddress, recipientAddress, param
       Substrate: recipientAddress
     }, collectionId, itemId, 1);
   } catch (e) {
-    console.error('error handling unique transfer nft', e);
+    console.error(e);
     return null;
   }
 }
@@ -61,7 +61,7 @@ function quartzGetExtrinsic(substrateApi, senderAddress, recipientAddress, param
       Substrate: recipientAddress
     }, collectionId, itemId, 1);
   } catch (e) {
-    console.error('error handling quartz transfer nft', e);
+    console.error(e);
     return null;
   }
 }
@@ -71,7 +71,7 @@ function statemineGetExtrinsic(substrateApi, senderAddress, recipientAddress, pa
     const collectionId = params.collectionId;
     return substrateApi.api.tx.uniques.transfer(collectionId, itemId, recipientAddress);
   } catch (e) {
-    console.error('error handling statemine transfer nft', e);
+    console.error(e);
     return null;
   }
 }

package/cjs/koni/api/nft/unique_nft/index.js

@@ -183,7 +183,7 @@ class UniqueNftApi extends _nft.BaseNftApi {
       }));
       params.cleanUpNfts(this.chain, address, collectionIds, allNftIds);
     } catch (e) {
-      console.error('Failed to fetch unique nft', e);
+      console.error(`${this.chain}`, e);
     }
   }
   async handleNfts(params) {

package/cjs/koni/api/nft/unique_nft/uniqueNftV2.js

@@ -53,7 +53,6 @@ class UniqueNftApiV2 extends _nft.BaseNftApi {
         const nfts = await this.getNftByAccount(address);
         allNfts = allNfts.concat(nfts);
       }));
-      console.log('allNfts', allNfts);
     } catch (e) {
       console.error(`Failed to fetch ${this.chain} nft`, e);
     }

package/cjs/koni/api/nft/wasm_nft/index.js

@@ -222,7 +222,6 @@ class WasmNftApi extends _nft.BaseNftApi {
         }
       }
       if (!itemDetail) {
-        console.warn(`Cannot fetch NFT metadata [${tokenId}] from PSP-34 contract.`);
         return nftItem;
       }
       nftItem.name = itemDetail.name;
@@ -304,7 +303,7 @@ class WasmNftApi extends _nft.BaseNftApi {
 
         nftOwnerMap[address] = nftIds;
       } catch (e) {
-        console.error(`error parsing item for ${this.chain} nft`, e);
+        console.error(`${this.chain}`, e);
       }
     }));
     if (isFeatured) {

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

@@ -10,6 +10,7 @@ exports.getAstarDappsInfo = getAstarDappsInfo;
 exports.getAstarNominatorMetadata = getAstarNominatorMetadata;
 exports.getAstarStakingMetadata = getAstarStakingMetadata;
 exports.getAstarUnbondingExtrinsic = getAstarUnbondingExtrinsic;
+exports.getAstarWithdrawable = getAstarWithdrawable;
 exports.getAstarWithdrawalExtrinsic = getAstarWithdrawalExtrinsic;
 var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
 var _utils = require("@subwallet/extension-base/koni/api/staking/bonding/utils");
@@ -109,17 +110,17 @@ async function getAstarNominatorMetadata(chainInfo, address, substrateApi) {
 
   const unlockingChunks = ledger.unbondingInfo.unlockingChunks;
   if (unlockingChunks.length > 0) {
-    const nearestUnstaking = unlockingChunks[0]; // only handle 1 unstaking request at a time, might need to change
-
-    const isClaimable = nearestUnstaking.unlockEra - parseInt(currentEra) <= 0;
-    const remainingEra = nearestUnstaking.unlockEra - (parseInt(currentEra) + 1);
-    const waitingTime = remainingEra * _constants._STAKING_ERA_LENGTH_MAP[chain];
-    unstakingList.push({
-      chain,
-      status: isClaimable ? _KoniTypes.UnstakingStatus.CLAIMABLE : _KoniTypes.UnstakingStatus.UNLOCKING,
-      claimable: nearestUnstaking.amount.toString(),
-      waitingTime: waitingTime > 0 ? waitingTime : 0
-    });
+    for (const unlockingChunk of unlockingChunks) {
+      const isClaimable = unlockingChunk.unlockEra - parseInt(currentEra) <= 0;
+      const remainingEra = unlockingChunk.unlockEra - (parseInt(currentEra) + 1);
+      const waitingTime = remainingEra * _constants._STAKING_ERA_LENGTH_MAP[chain];
+      unstakingList.push({
+        chain,
+        status: isClaimable ? _KoniTypes.UnstakingStatus.CLAIMABLE : _KoniTypes.UnstakingStatus.UNLOCKING,
+        claimable: unlockingChunk.amount.toString(),
+        waitingTime: waitingTime > 0 ? waitingTime : 0
+      });
+    }
   }
   if (nominationList.length === 0 && unstakingList.length === 0) {
     return {
@@ -260,6 +261,21 @@ async function getAstarClaimRewardExtrinsic(substrateApi, address) {
       transactions.push(tx);
     }
   }
-  console.log('no of astar claim reward tx: ', transactions.length);
   return apiPromise.api.tx.utility.batch(transactions);
+}
+function getAstarWithdrawable(nominatorMetadata) {
+  const unstakingInfo = {
+    chain: nominatorMetadata.chain,
+    status: _KoniTypes.UnstakingStatus.CLAIMABLE,
+    claimable: '0',
+    waitingTime: 0
+  };
+  let bnWithdrawable = _util.BN_ZERO;
+  for (const unstaking of nominatorMetadata.unstakings) {
+    if (unstaking.status === _KoniTypes.UnstakingStatus.CLAIMABLE) {
+      bnWithdrawable = bnWithdrawable.add(new _util.BN(unstaking.claimable));
+    }
+  }
+  unstakingInfo.claimable = bnWithdrawable.toString();
+  return unstakingInfo;
 }

package/cjs/koni/api/staking/bonding/utils.js

@@ -25,6 +25,7 @@ exports.parseIdentity = parseIdentity;
 exports.parsePoolStashAddress = parsePoolStashAddress;
 exports.transformPoolName = transformPoolName;
 var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
+var _astar = require("@subwallet/extension-base/koni/api/staking/bonding/astar");
 var _constants = require("@subwallet/extension-base/services/chain-service/constants");
 var _utils = require("@subwallet/extension-base/utils");
 var _util = require("@polkadot/util");
@@ -238,6 +239,9 @@ function isActionFromValidator(stakingType, chain) {
 function getWithdrawalInfo(nominatorMetadata) {
   const unstakings = nominatorMetadata.unstakings;
   let result;
+  if (_constants._STAKING_CHAIN_GROUP.astar.includes(nominatorMetadata.chain)) {
+    return (0, _astar.getAstarWithdrawable)(nominatorMetadata);
+  }
   for (const unstaking of unstakings) {
     if (unstaking.status === _KoniTypes.UnstakingStatus.CLAIMABLE) {
       result = unstaking; // only get the first withdrawal

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

@@ -164,7 +164,6 @@ async function getNominationPoolReward(addresses, chainInfoMap, substrateApiMap)
       }));
     }));
   } catch (e) {
-    console.error('Error fetching unclaimed reward for nomination pool', e);
     return rewardList;
   }
   return rewardList;

package/cjs/koni/api/staking/subsquidStaking.js

@@ -83,7 +83,6 @@ const getSubsquidStaking = async (accounts, chain, chainInfoMap) => {
     }));
     return result;
   } catch (e) {
-    console.error(`error getting ${chain} staking reward from subsquid`, e);
     return [];
   }
 };
@@ -101,7 +100,6 @@ const getAllSubsquidStaking = async (accounts, chainInfoMap) => {
       rewardList = rewardList.concat(rewardItems);
     }));
   } catch (e) {
-    console.error('Error fetching staking reward from SubSquid', e);
     return rewardList;
   }
   return rewardList;

package/cjs/koni/api/tokens/wasm/index.js

@@ -31,7 +31,6 @@ async function getPSP34TransferExtrinsic(networkKey, substrateApi, senderAddress
       gasLimit
     }, recipientAddress, onChainOption, {});
   } catch (e) {
-    console.error('Error getting WASM NFT transfer extrinsic', e);
     return null;
   }
 }

package/cjs/koni/api/tokens/wasm/utils.js

@@ -16,7 +16,6 @@ const toContractAbiMessage = (contractPromise, message) => {
   if (!value) {
     const messages = contractPromise === null || contractPromise === void 0 ? void 0 : contractPromise.abi.messages.map(m => m.method).join(', ');
     const error = `"${message}" not found in metadata.spec.messages: [${messages}]`;
-    console.error(error);
     return {
       ok: false,
       error

package/cjs/koni/api/xcm/index.js

@@ -32,7 +32,6 @@ const createXcmExtrinsic = async _ref => {
   } else {
     extrinsic = (0, _xTokens.getExtrinsicByXtokensPallet)(originTokenInfo, originChainInfo, destinationChainInfo, recipient, sendingValue, api);
   }
-  console.log('XCM extrinsic: ', extrinsic.toHex());
   return extrinsic;
 };
 exports.createXcmExtrinsic = createXcmExtrinsic;