@subwallet/extension-base 1.3.64-0 → 1.3.66-0

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

@@ -0,0 +1,19 @@
+"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 OptimizeEnableToken extends _Base.default {
+  async run() {
+    // Reset the hasOptimizedTokens flag to allow re-optimize tokens
+    this.state.balanceService.enableOptimizeTokenPromise();
+    return Promise.resolve();
+  }
+}
+exports.default = OptimizeEnableToken;

package/cjs/services/migration-service/scripts/databases/MigrateAssetSetting20251107.js

@@ -0,0 +1,37 @@
+"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 MigrateAssetSetting20251107 extends _Base.default {
+  async run() {
+    try {
+      const changeSlugsMap = {
+        'bittensor-LOCAL-ف': 'bittensor-LOCAL-ㄴ'
+      };
+      const assetSetting = await this.state.chainService.getAssetSettings();
+      const migratedAssetSetting = {};
+      for (const [oldSlug, newSlug] of Object.entries(changeSlugsMap)) {
+        if (Object.keys(assetSetting).includes(oldSlug)) {
+          const isVisible = assetSetting[oldSlug].visible;
+          migratedAssetSetting[newSlug] = {
+            visible: isVisible
+          };
+        }
+      }
+      this.state.chainService.setAssetSettings({
+        ...assetSetting,
+        ...migratedAssetSetting
+      });
+    } catch (e) {
+      console.error(e);
+    }
+  }
+}
+exports.default = MigrateAssetSetting20251107;

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

@@ -5,11 +5,13 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = exports.MYTHOS_MIGRATION_KEY = exports.EVERYTIME = void 0;
+var _MigrateAssetSetting = _interopRequireDefault(require("@subwallet/extension-base/services/migration-service/scripts/databases/MigrateAssetSetting20251107"));
 var _MigrateChainPatrol = _interopRequireDefault(require("@subwallet/extension-base/services/migration-service/scripts/MigrateChainPatrol"));
+var _MigrateTransactionHistoryBySymbol = _interopRequireDefault(require("@subwallet/extension-base/services/migration-service/scripts/MigrateTransactionHistoryBySymbol20251107"));
 var _ClearMetadataDatabase = _interopRequireDefault(require("./databases/ClearMetadataDatabase"));
 var _ClearMetadataForMythos = _interopRequireDefault(require("./databases/ClearMetadataForMythos"));
-var _MigrateAssetSetting = _interopRequireDefault(require("./databases/MigrateAssetSetting"));
-var _MigrateAssetSetting2 = _interopRequireDefault(require("./databases/MigrateAssetSetting20251027"));
+var _MigrateAssetSetting2 = _interopRequireDefault(require("./databases/MigrateAssetSetting"));
+var _MigrateAssetSetting3 = _interopRequireDefault(require("./databases/MigrateAssetSetting20251027"));
 var _MigrateEarningVersion = _interopRequireDefault(require("./databases/MigrateEarningVersion"));
 var _ReloadMetadata = _interopRequireDefault(require("./databases/ReloadMetadata"));
 var _MigrateLedgerAccount = _interopRequireDefault(require("./keyring/MigrateLedgerAccount"));
@@ -24,6 +26,7 @@ var _DeleteChain = _interopRequireDefault(require("./DeleteChain"));
 var _DeleteChainStaking = _interopRequireDefault(require("./DeleteChainStaking"));
 var _DeleteEarningData = _interopRequireDefault(require("./DeleteEarningData"));
 var _DeleteEarningData2 = _interopRequireDefault(require("./DeleteEarningData20251010"));
+var _DeleteEarningData3 = _interopRequireDefault(require("./DeleteEarningData20251105"));
 var _DisableZeroBalanceTokens = _interopRequireDefault(require("./DisableZeroBalanceTokens"));
 var _EnableVaraChain = _interopRequireDefault(require("./EnableVaraChain"));
 var _MigrateAuthUrls = _interopRequireDefault(require("./MigrateAuthUrls"));
@@ -33,9 +36,10 @@ var _MigrateNewUnifiedAccount = _interopRequireDefault(require("./MigrateNewUnif
 var _MigrateTokenDecimals = _interopRequireDefault(require("./MigrateTokenDecimals"));
 var _MigrateTransactionHistory = _interopRequireDefault(require("./MigrateTransactionHistory"));
 var _MigrateTransactionHistoryBridge = _interopRequireDefault(require("./MigrateTransactionHistoryBridge"));
-var _MigrateTransactionHistoryBySymbol = _interopRequireDefault(require("./MigrateTransactionHistoryBySymbol"));
-var _MigrateTransactionHistoryBySymbol2 = _interopRequireDefault(require("./MigrateTransactionHistoryBySymbol20251027"));
+var _MigrateTransactionHistoryBySymbol2 = _interopRequireDefault(require("./MigrateTransactionHistoryBySymbol"));
+var _MigrateTransactionHistoryBySymbol3 = _interopRequireDefault(require("./MigrateTransactionHistoryBySymbol20251027"));
 var _MigrateWalletReference = _interopRequireDefault(require("./MigrateWalletReference"));
+var _OptimizeEnableToken = _interopRequireDefault(require("./OptimizeEnableToken"));
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
@@ -67,8 +71,8 @@ var _default = {
   '1.1.33-01': _MigrateLedgerAccountV.default,
   '1.1.41-01': _DeleteChainStaking.default,
   // '1.1.46-01': AutoEnableSomeTokens,
-  '1.3.55-01': _MigrateAssetSetting.default,
-  '1.3.55-02': _MigrateTransactionHistoryBySymbol.default,
+  '1.3.55-01': _MigrateAssetSetting2.default,
+  '1.3.55-02': _MigrateTransactionHistoryBySymbol2.default,
   '1.2.69-01': _MigrateRemoveGenesisHash.default,
   '1.2.13-01': _ReloadMetadata.default,
   '1.2.32-01': _MigratePairData.default,
@@ -81,7 +85,11 @@ var _default = {
   '1.3.42-01': _MigrateNewUnifiedAccount.default,
   '1.3.54-01': _MigrateChainPatrol.default,
   '1.3.62-01': _DeleteEarningData2.default,
-  '1.3.64-01': _MigrateAssetSetting2.default,
-  '1.3.64-02': _MigrateTransactionHistoryBySymbol2.default
+  '1.3.58-01': _OptimizeEnableToken.default,
+  '1.3.64-01': _MigrateAssetSetting3.default,
+  '1.3.64-02': _MigrateTransactionHistoryBySymbol3.default,
+  '1.3.65-01': _DeleteEarningData3.default,
+  '1.3.66-01': _MigrateAssetSetting.default,
+  '1.3.66-02': _MigrateTransactionHistoryBySymbol.default
 };
 exports.default = _default;

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

@@ -205,7 +205,7 @@ class EvmRequestHandler {
     const params = {
       ...transaction,
       gas: (0, _eth.anyNumberToBN)(gas).toNumber(),
-      value: (0, _eth.anyNumberToBN)(value).toNumber(),
+      value: (0, _eth.anyNumberToBN)(value).toFixed(),
       gasPrice: (0, _eth.anyNumberToBN)(gasPrice).toNumber(),
       gasLimit: (0, _eth.anyNumberToBN)(estimateGas).toNumber(),
       maxFeePerGas: (0, _eth.anyNumberToBN)(maxFeePerGas).toNumber(),

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

@@ -1430,7 +1430,7 @@ class TransactionService {
       maxPriorityFeePerGas: (0, _utils4.anyNumberToBN)(payload.maxPriorityFeePerGas).toNumber(),
       gasLimit: (0, _utils4.anyNumberToBN)(payload.gas).toNumber(),
       to: payload.to,
-      value: (0, _utils4.anyNumberToBN)(payload.value).toNumber(),
+      value: (0, _utils4.anyNumberToBN)(payload.value).toFixed(),
       data: payload.data,
       chainId: payload.chainId
     };

package/cjs/utils/eth.js

@@ -33,12 +33,13 @@ class Transaction {
 }
 exports.Transaction = Transaction;
 const anyNumberToBN = value => {
+  // TODO: Be careful when using .toNumber() outside this function. It may not round exactly for very large numbers.
   if (typeof value === 'string' || typeof value === 'number') {
     return new _bignumber.default(value);
   } else if (typeof value === 'undefined') {
     return new _bignumber.default(0);
   } else {
-    return new _bignumber.default(value.toNumber());
+    return new _bignumber.default(value.toString());
   }
 };
 exports.anyNumberToBN = anyNumberToBN;

package/cjs/utils/fee/transfer.js

@@ -387,11 +387,7 @@ const calculateXcmMaxTransferable = async (id, request, freeBalance, fee) => {
       funcCreateExtrinsic = _xcm.createPolygonBridgeExtrinsic;
     } else if (isAcrossBridgeTransfer) {
       funcCreateExtrinsic = _xcm.createAcrossBridgeExtrinsic;
-      if ((0, _acrossBridge._isAcrossTestnetBridge)(srcChain.slug)) {
-        params.sendingValue = (0, _bignumber.default)(0.0037).shiftedBy((0, _utils2._getAssetDecimals)(srcToken)).toFixed(0, 1);
-      } else {
-        params.sendingValue = (0, _bignumber.default)(1).shiftedBy((0, _utils2._getAssetDecimals)(srcToken)).toFixed(0, 1);
-      }
+      params.sendingValue = await (0, _acrossBridge.getAcrossSendingValue)(srcChain, srcToken, destChain, (0, _acrossBridge._isAcrossTestnetBridge)(srcChain.slug));
     } else if (isSnowBridgeEvmTransfer) {
       funcCreateExtrinsic = _xcm.createSnowBridgeExtrinsic;
     } else if (isAvailBridgeFromEvm) {

package/koni/background/handlers/State.js

@@ -1804,6 +1804,7 @@ export default class KoniState {
       await this.priceService.setPriceCurrency(DEFAULT_CURRENCY);
       this.settingService.resetWallet();
       await this.priceService.setPriceCurrency(DEFAULT_CURRENCY);
+      this.chainService.resetPopularTokenList();
     }
     this.chainService.resetWallet(resetAll);
     await this.walletConnectService.resetWallet(resetAll);

package/package.json

@@ -17,7 +17,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "1.3.64-0",
+  "version": "1.3.66-0",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -1491,6 +1491,11 @@
       "require": "./cjs/services/migration-service/scripts/databases/MigrateAssetSetting20251027.js",
       "default": "./services/migration-service/scripts/databases/MigrateAssetSetting20251027.js"
     },
+    "./services/migration-service/scripts/databases/MigrateAssetSetting20251107": {
+      "types": "./services/migration-service/scripts/databases/MigrateAssetSetting20251107.d.ts",
+      "require": "./cjs/services/migration-service/scripts/databases/MigrateAssetSetting20251107.js",
+      "default": "./services/migration-service/scripts/databases/MigrateAssetSetting20251107.js"
+    },
     "./services/migration-service/scripts/databases/MigrateEarningHistory": {
       "types": "./services/migration-service/scripts/databases/MigrateEarningHistory.d.ts",
       "require": "./cjs/services/migration-service/scripts/databases/MigrateEarningHistory.js",
@@ -1526,6 +1531,11 @@
       "require": "./cjs/services/migration-service/scripts/DeleteEarningData20251010.js",
       "default": "./services/migration-service/scripts/DeleteEarningData20251010.js"
     },
+    "./services/migration-service/scripts/DeleteEarningData20251105": {
+      "types": "./services/migration-service/scripts/DeleteEarningData20251105.d.ts",
+      "require": "./cjs/services/migration-service/scripts/DeleteEarningData20251105.js",
+      "default": "./services/migration-service/scripts/DeleteEarningData20251105.js"
+    },
     "./services/migration-service/scripts/DisableZeroBalanceTokens": {
       "types": "./services/migration-service/scripts/DisableZeroBalanceTokens.d.ts",
       "require": "./cjs/services/migration-service/scripts/DisableZeroBalanceTokens.js",
@@ -1626,11 +1636,21 @@
       "require": "./cjs/services/migration-service/scripts/MigrateTransactionHistoryBySymbol20251027.js",
       "default": "./services/migration-service/scripts/MigrateTransactionHistoryBySymbol20251027.js"
     },
+    "./services/migration-service/scripts/MigrateTransactionHistoryBySymbol20251107": {
+      "types": "./services/migration-service/scripts/MigrateTransactionHistoryBySymbol20251107.d.ts",
+      "require": "./cjs/services/migration-service/scripts/MigrateTransactionHistoryBySymbol20251107.js",
+      "default": "./services/migration-service/scripts/MigrateTransactionHistoryBySymbol20251107.js"
+    },
     "./services/migration-service/scripts/MigrateWalletReference": {
       "types": "./services/migration-service/scripts/MigrateWalletReference.d.ts",
       "require": "./cjs/services/migration-service/scripts/MigrateWalletReference.js",
       "default": "./services/migration-service/scripts/MigrateWalletReference.js"
     },
+    "./services/migration-service/scripts/OptimizeEnableToken": {
+      "types": "./services/migration-service/scripts/OptimizeEnableToken.d.ts",
+      "require": "./cjs/services/migration-service/scripts/OptimizeEnableToken.js",
+      "default": "./services/migration-service/scripts/OptimizeEnableToken.js"
+    },
     "./services/migration-service/scripts/providers/MigrateEthProvider": {
       "types": "./services/migration-service/scripts/providers/MigrateEthProvider.d.ts",
       "require": "./cjs/services/migration-service/scripts/providers/MigrateEthProvider.js",
@@ -2898,16 +2918,16 @@
     "@polkadot/util-crypto": "^13.5.3",
     "@polkadot/x-global": "^13.5.3",
     "@reduxjs/toolkit": "^1.9.1",
-    "@snowbridge/api": "^0.2.0",
+    "@snowbridge/api": "^0.2.13",
     "@snowbridge/registry": "^0.2.0",
     "@sora-substrate/type-definitions": "^1.17.7",
     "@substrate/connect": "^0.8.9",
-    "@subwallet-monorepos/subwallet-services-sdk": "^0.1.8",
-    "@subwallet/chain-list": "0.2.120",
-    "@subwallet/extension-base": "^1.3.64-0",
-    "@subwallet/extension-chains": "^1.3.64-0",
-    "@subwallet/extension-dapp": "^1.3.64-0",
-    "@subwallet/extension-inject": "^1.3.64-0",
+    "@subwallet-monorepos/subwallet-services-sdk": "0.1.13",
+    "@subwallet/chain-list": "0.2.121",
+    "@subwallet/extension-base": "^1.3.66-0",
+    "@subwallet/extension-chains": "^1.3.66-0",
+    "@subwallet/extension-dapp": "^1.3.66-0",
+    "@subwallet/extension-inject": "^1.3.66-0",
     "@subwallet/keyring": "^0.1.13",
     "@subwallet/ui-keyring": "^0.1.13",
     "@ton/core": "^0.56.3",

package/packageInfo.js

@@ -7,5 +7,5 @@ export const packageInfo = {
   name: '@subwallet/extension-base',
   path: (import.meta && import.meta.url) ? new URL(import.meta.url).pathname.substring(0, new URL(import.meta.url).pathname.lastIndexOf('/') + 1) : 'auto',
   type: 'esm',
-  version: '1.3.64-0'
+  version: '1.3.66-0'
 };

package/services/balance-service/index.d.ts

@@ -18,6 +18,7 @@ export declare class BalanceService implements StoppableServiceInterface {
     stopPromiseHandler: PromiseHandler<void>;
     status: ServiceStatus;
     private isReload;
+    private requireOptimizeTokenList;
     get isStarted(): boolean;
     private readonly detectAccountBalanceStore;
     private readonly balanceDetectSubject;
@@ -101,4 +102,11 @@ export declare class BalanceService implements StoppableServiceInterface {
     private startScanBalance;
     private stopScanBalance;
     getOptimalTransferProcess(params: RequestOptimalTransferProcess): Promise<CommonOptimalTransferPath>;
+    evmDetectBalanceToken(addresses: string[]): Promise<string[]>;
+    substrateDetectBalanceToken(addresses: string[]): Promise<string[]>;
+    evmDetectBalanceChain(): Promise<string[]>;
+    substrateDetectBalanceChain(): string[];
+    /** optimize token area **/
+    enableOptimizeTokenPromise(): void;
+    optimizeEnableTokens(): Promise<void>;
 }

package/services/balance-service/index.js

@@ -7,7 +7,7 @@ import { ALL_ACCOUNT_KEY } from '@subwallet/extension-base/constants';
 import { _isXcmWithinSameConsensus } from '@subwallet/extension-base/core/substrate/xcm-parser';
 import { getAcrossbridgeTransferProcessFromEvm, getDefaultTransferProcess, getSnowbridgeTransferProcessFromEvm } from '@subwallet/extension-base/services/balance-service/helpers/process';
 import { ServiceStatus } from '@subwallet/extension-base/services/base/types';
-import { _getChainNativeTokenSlug, _isNativeToken, _isPureEvmChain } from '@subwallet/extension-base/services/chain-service/utils';
+import { _getChainNativeTokenSlug, _isCustomAsset, _isNativeToken, _isPureEvmChain } from '@subwallet/extension-base/services/chain-service/utils';
 import DetectAccountBalanceStore from '@subwallet/extension-base/stores/DetectAccountBalance';
 import { addLazy, createPromiseHandler, isAccountAll, waitTimeout } from '@subwallet/extension-base/utils';
 import { getKeypairTypeByAddress } from '@subwallet/keyring';
@@ -32,13 +32,14 @@ export class BalanceService {
   stopPromiseHandler = createPromiseHandler();
   status = ServiceStatus.NOT_INITIALIZED;
   isReload = false;
+  requireOptimizeTokenList = false;
   get isStarted() {
     return this.status === ServiceStatus.STARTED;
   }
   detectAccountBalanceStore = new DetectAccountBalanceStore();
   balanceDetectSubject = new BehaviorSubject({});
-  intervalTime = 3 * 60 * 1000;
-  cacheTime = 15 * 60 * 1000;
+  intervalTime = 3 * 60 * 1000; // scan balance every 3 mins
+  cacheTime = 15 * 60 * 1000; // cache time 15 mins to run again
 
   /**
    * @constructor
@@ -90,6 +91,10 @@ export class BalanceService {
     this.stopPromiseHandler = createPromiseHandler();
     this.status = ServiceStatus.STARTED;
     this.startPromiseHandler.resolve();
+    if (this.requireOptimizeTokenList) {
+      await this.optimizeEnableTokens();
+      this.requireOptimizeTokenList = false;
+    }
   }
 
   /** Stop service */
@@ -447,18 +452,12 @@ export class BalanceService {
       const type = getKeypairTypeByAddress(address);
       const typeValid = [...EthereumKeypairTypes].includes(type);
       if (typeValid) {
-        return new Promise(resolve => {
-          const timeOutPromise = new Promise(_resolve => {
-            setTimeout(() => _resolve([]), 30000);
-          });
-          const balanceDetectionApi = subwalletApiSdk.balanceDetectionApi || Promise.resolve([]);
-          Promise.race([timeOutPromise, balanceDetectionApi.getEvmTokenBalanceSlug(address)]).then(result => resolve(result)).catch(error => {
-            console.error(error);
-            resolve(null);
-          });
+        return subwalletApiSdk.balanceDetectionApi.getSubWalletTokenBalance(address).catch(e => {
+          console.error(e);
+          return null;
         });
       } else {
-        return Promise.resolve(null);
+        return null;
       }
     });
     const needEnableChains = [];
@@ -516,13 +515,13 @@ export class BalanceService {
     }
     for (const balanceData of evmBalanceDataList) {
       if (balanceData) {
-        for (const slug of balanceData) {
+        for (const tokenSlug of balanceData) {
           var _currentAssetSettings2;
-          const chainSlug = slug.split('-')[0];
+          const chainSlug = tokenSlug.split('-')[0];
           const chainState = this.state.chainService.getChainStateByKey(chainSlug);
-          const existedKey = Object.keys(assetMap).find(v => v.toLowerCase() === slug.toLowerCase());
+          const existedKey = Object.keys(assetMap).find(v => v.toLowerCase() === tokenSlug.toLowerCase());
 
-          // Cancel is chain is turned off by user
+          // Cancel if chain is turned off by user
           if (chainState && chainState.manualTurnOff) {
             continue;
           }
@@ -628,4 +627,146 @@ export class BalanceService {
     }
     return getDefaultTransferProcess();
   }
+
+  // only evm addresses
+  async evmDetectBalanceToken(addresses) {
+    const assetMap = this.state.chainService.getAssetRegistry();
+    const evmPromiseList = addresses.map(address => {
+      return subwalletApiSdk.balanceDetectionApi.getSubWalletTokenBalance(address).catch(e => {
+        console.error(e);
+        return null;
+      });
+    });
+    const needActiveTokens = [];
+    const evmBalanceDataList = await Promise.all(evmPromiseList);
+    for (const balanceData of evmBalanceDataList) {
+      if (balanceData) {
+        for (const tokenSlug of balanceData) {
+          const chainSlug = tokenSlug.split('-')[0];
+          const chainState = this.state.chainService.getChainStateByKey(chainSlug);
+          const existedKey = Object.keys(assetMap).find(v => v.toLowerCase() === tokenSlug.toLowerCase());
+
+          // Cancel is chain is turned off by user
+          if (chainState && chainState.manualTurnOff) {
+            continue;
+          }
+          if (existedKey) {
+            needActiveTokens.push(existedKey);
+          }
+        }
+      }
+    }
+    return needActiveTokens;
+  }
+
+  // only for substrate addresses
+  async substrateDetectBalanceToken(addresses) {
+    const assetMap = this.state.chainService.getAssetRegistry();
+    const promiseList = addresses.map(address => {
+      return this.state.subscanService.getMultiChainBalance(address).catch(e => {
+        console.error(e);
+        return null;
+      });
+    });
+    const needActiveTokens = [];
+    const balanceDataList = await Promise.all(promiseList);
+    const chainInfoMap = this.state.chainService.getChainInfoMap();
+    const detectBalanceChainSlugMap = this.state.chainService.detectBalanceChainSlugMap;
+    for (const balanceData of balanceDataList) {
+      if (balanceData) {
+        for (const balanceDatum of balanceData) {
+          const {
+            balance,
+            bonded,
+            category,
+            locked,
+            network,
+            symbol
+          } = balanceDatum;
+          const chain = detectBalanceChainSlugMap[network];
+          const chainState = this.state.chainService.getChainStateByKey(chain);
+          const chainInfo = chain ? chainInfoMap[chain] : null;
+          const balanceIsEmpty = (!balance || balance === '0') && (!locked || locked === '0') && (!bonded || bonded === '0');
+          const tokenKey = `${chain}-${category === 'native' ? 'NATIVE' : 'LOCAL'}-${symbol.toUpperCase()}`;
+          const existedKey = Object.keys(assetMap).find(v => v.toLowerCase() === tokenKey.toLowerCase());
+
+          // Cancel if chain is not supported or is testnet
+          if (!chainInfo || chainInfo.isTestnet) {
+            continue;
+          }
+
+          // Cancel is balance is 0
+          if (balanceIsEmpty) {
+            continue;
+          }
+
+          // Cancel is chain is turned off by user
+          if (chainState && chainState.manualTurnOff) {
+            continue;
+          }
+          if (existedKey) {
+            needActiveTokens.push(existedKey);
+          }
+        }
+      }
+    }
+    return needActiveTokens;
+  }
+  async evmDetectBalanceChain() {
+    const blockscoutChain = await subwalletApiSdk.balanceDetectionApi.getBlockscoutChainData();
+    const blockscoutChainId = Object.keys(blockscoutChain);
+    const evmDetectChain = Object.values(this.state.chainService.getChainInfoMap()).filter(info => {
+      var _info$evmInfo, _info$evmInfo2;
+      return !!((_info$evmInfo = info.evmInfo) !== null && _info$evmInfo !== void 0 && _info$evmInfo.evmChainId) && blockscoutChainId.includes((_info$evmInfo2 = info.evmInfo) === null || _info$evmInfo2 === void 0 ? void 0 : _info$evmInfo2.evmChainId.toString());
+    }).map(chainInfo => chainInfo.slug);
+    return evmDetectChain;
+  }
+  substrateDetectBalanceChain() {
+    const substrateDetectChain = Object.values(this.state.chainService.getChainInfoMap()).filter(info => {
+      var _info$extraInfo;
+      return !!info.substrateInfo && !!((_info$extraInfo = info.extraInfo) !== null && _info$extraInfo !== void 0 && _info$extraInfo.chainBalanceSlug);
+    }).map(chainInfo => chainInfo.slug);
+    return substrateDetectChain;
+  }
+
+  /** optimize token area **/
+
+  enableOptimizeTokenPromise() {
+    this.requireOptimizeTokenList = true;
+  }
+  async optimizeEnableTokens() {
+    try {
+      const assetSettings = await this.state.chainService.getAssetSettings();
+      const assetMap = this.state.chainService.getAssetRegistry();
+      const addresses = keyring.getPairs().map(account => account.address);
+      const evmAddresses = addresses.filter(address => [...EthereumKeypairTypes].includes(getKeypairTypeByAddress(address)));
+      const substrateAddresses = addresses.filter(address => [...SubstrateKeypairTypes].includes(getKeypairTypeByAddress(address)));
+      const [nonZeroBalanceEvmToken, nonZeroBalanceSubstrateToken] = await Promise.all([this.evmDetectBalanceToken(evmAddresses), this.substrateDetectBalanceToken(substrateAddresses)]);
+      const substrateDetectChain = this.substrateDetectBalanceChain();
+      const evmDetectChain = await this.evmDetectBalanceChain();
+      const updatedSettings = structuredClone(assetSettings);
+      Object.entries(assetSettings).forEach(([tokenSlug, setting]) => {
+        const isNonZeroBalanceToken = nonZeroBalanceEvmToken.includes(tokenSlug) || nonZeroBalanceSubstrateToken.includes(tokenSlug);
+        const assetInfo = assetMap[tokenSlug];
+        const isEvmDetectChain = evmDetectChain.includes(assetInfo.originChain);
+        const isSubstrateDetectChain = substrateDetectChain.includes(assetInfo.originChain);
+        if (isNonZeroBalanceToken && !setting.visible) {
+          // enable non-zero balance tokens
+          updatedSettings[tokenSlug] = {
+            visible: true
+          };
+        } else if (!isNonZeroBalanceToken && setting.visible && !_isNativeToken(assetInfo) && !_isCustomAsset(tokenSlug) && (isEvmDetectChain || isSubstrateDetectChain)) {
+          // hide tokens with zero balance that aren't native or custom
+          updatedSettings[tokenSlug] = {
+            visible: false
+          };
+        }
+      });
+      this.state.chainService.setAssetSettings(updatedSettings);
+    } catch (e) {
+      console.error(e);
+    }
+  }
+
+  /** optimize token area **/
 }

package/services/balance-service/transfer/xcm/acrossBridge/index.d.ts

@@ -1,3 +1,4 @@
+import { _ChainAsset, _ChainInfo } from '@subwallet/chain-list/types';
 import { CreateXcmExtrinsicProps } from '..';
 export declare function _isAcrossChainBridge(srcChain: string, destChain: string): boolean;
 export declare function _isAcrossTestnetBridge(srcChain: string): boolean;
@@ -13,4 +14,5 @@ interface XcmApiResponse {
     metadata?: any;
 }
 export declare const getAcrossQuote: ({ destinationChain, destinationTokenInfo, originChain, originTokenInfo, recipient, sender, sendingValue }: CreateXcmExtrinsicProps) => Promise<XcmApiResponse>;
+export declare const getAcrossSendingValue: (originChain: _ChainInfo, originTokenInfo: _ChainAsset, destinationChain: _ChainInfo, isTestnet: boolean) => Promise<string>;
 export {};

package/services/balance-service/transfer/xcm/acrossBridge/index.js

@@ -2,12 +2,16 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { COMMON_CHAIN_SLUGS } from '@subwallet/chain-list';
+import { TransactionError } from '@subwallet/extension-base/background/errors/TransactionError';
 import { _isAcrossBridgeXcm } from '@subwallet/extension-base/core/substrate/xcm-parser';
+import { _getAssetDecimals, _getContractAddressOfToken, _getEvmChainId } from '@subwallet/extension-base/services/chain-service/utils';
+import { BasicTxErrorType } from '@subwallet/extension-base/types';
 import subwalletApiSdk from '@subwallet-monorepos/subwallet-services-sdk';
+import BigN from 'bignumber.js';
 // Across Bridge
 const acrossPairsMap = new Map([[COMMON_CHAIN_SLUGS.ETHEREUM, new Set(['optimism', 'base_mainnet', 'arbitrum_one'])], ['optimism', new Set([COMMON_CHAIN_SLUGS.ETHEREUM, 'base_mainnet', 'arbitrum_one'])], ['base_mainnet', new Set([COMMON_CHAIN_SLUGS.ETHEREUM, 'optimism', 'arbitrum_one'])], ['arbitrum_one', new Set([COMMON_CHAIN_SLUGS.ETHEREUM, 'optimism', 'base_mainnet'])], [COMMON_CHAIN_SLUGS.ETHEREUM_SEPOLIA, new Set(['base_sepolia', 'arbitrum_sepolia'])],
 // TESTNET START HERE
-['base_sepolia', new Set([COMMON_CHAIN_SLUGS.ETHEREUM_SEPOLIA])], ['arbitrum_sepolia', new Set([COMMON_CHAIN_SLUGS.ETHEREUM_SEPOLIA])]]);
+['base_sepolia', new Set([COMMON_CHAIN_SLUGS.ETHEREUM_SEPOLIA, 'arbitrum_sepolia'])], ['arbitrum_sepolia', new Set([COMMON_CHAIN_SLUGS.ETHEREUM_SEPOLIA, 'base_sepolia'])]]);
 export function _isAcrossChainBridge(srcChain, destChain) {
   var _acrossPairsMap$get$h, _acrossPairsMap$get;
   return (_acrossPairsMap$get$h = (_acrossPairsMap$get = acrossPairsMap.get(srcChain)) === null || _acrossPairsMap$get === void 0 ? void 0 : _acrossPairsMap$get.has(destChain)) !== null && _acrossPairsMap$get$h !== void 0 ? _acrossPairsMap$get$h : false;
@@ -33,7 +37,7 @@ export const getAcrossQuote = async ({
     throw new Error('Sender is required');
   }
   try {
-    const data = await subwalletApiSdk.xcmApi.fetchXcmData({
+    const data = await subwalletApiSdk.bridgeApi.fetchBridgeData({
       address: sender,
       from: originTokenInfo.slug,
       to: destinationTokenInfo.slug,
@@ -50,4 +54,45 @@ export const getAcrossQuote = async ({
     }
     return Promise.reject(new Error((error === null || error === void 0 ? void 0 : error.message) || 'Unable to perform this transaction at the moment. Try again later'));
   }
+};
+
+// TODO: update logic after add across metadata for chainlist
+const acrossNativeTokenAddresses = {
+  mainnet: {
+    arbitrum_one: '0x82aF49447D8a07e3bd95BD0d56f35241523fBab1',
+    base_mainnet: '0x4200000000000000000000000000000000000006',
+    ethereum: '0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2',
+    optimism: '0x4200000000000000000000000000000000000006'
+  },
+  testnet: {
+    arbitrum_sepolia: '0x980B62Da83eFf3D4576C647993b0c1D7faf17c73',
+    base_sepolia: '0x4200000000000000000000000000000000000006',
+    sepolia_ethereum: '0xfFf9976782d46CC05630D1f6eBAb18b2324d6B14'
+  }
+};
+export const getAcrossSendingValue = async (originChain, originTokenInfo, destinationChain, isTestnet) => {
+  try {
+    const originChainId = _getEvmChainId(originChain);
+    const destinationChainId = _getEvmChainId(destinationChain);
+    if (!originChainId || !destinationChainId) {
+      return Promise.reject(new TransactionError(BasicTxErrorType.INVALID_PARAMS));
+    }
+    const contracts = isTestnet ? acrossNativeTokenAddresses.testnet : acrossNativeTokenAddresses.mainnet;
+    const fromContract = _getContractAddressOfToken(originTokenInfo) || contracts[originTokenInfo.originChain];
+    const acrossBridgeLimit = await subwalletApiSdk.bridgeApi.getAcrossBridgeLimit(originChainId, destinationChainId, fromContract, isTestnet);
+    if (!acrossBridgeLimit.minDeposit || !acrossBridgeLimit.maxDeposit) {
+      throw new Error('Invalid Across Bridge response');
+    }
+    const min = new BigN(acrossBridgeLimit.minDeposit);
+    const max = new BigN(acrossBridgeLimit.maxDeposit);
+    // Use the midpoint between minDeposit and maxDeposit as a balanced value used for estimating gas fee more accurately
+    const sendingValue = min.plus(max).div(2).toFixed(0);
+    return sendingValue;
+  } catch (error) {
+    console.error('Across Bridge error:', error);
+
+    // fallback in case fetch API fail
+    const defaultSendingAmount = isTestnet ? 0.0037 : 1;
+    return new BigN(defaultSendingAmount).shiftedBy(_getAssetDecimals(originTokenInfo)).toFixed(0, BigN.ROUND_FLOOR);
+  }
 };

package/services/balance-service/transfer/xcm/index.js

@@ -181,7 +181,7 @@ export const createAcrossBridgeExtrinsic = async ({
     throw new Error('Sender is required');
   }
   try {
-    const data = await subwalletApiSdk.xcmApi.fetchXcmData({
+    const data = await subwalletApiSdk.bridgeApi.fetchBridgeData({
       address: sender,
       from: originTokenInfo.slug,
       to: destinationTokenInfo.slug,
@@ -204,9 +204,14 @@ export const createAcrossBridgeExtrinsic = async ({
     transactionConfig.gas = gasLimit.toString();
     return transactionConfig;
   } catch (error) {
+    var _message, _message$toLowerCase;
     if (error instanceof SyntaxError) {
       return Promise.reject(new Error('Unable to perform this transaction at the moment. Try again later'));
     }
-    return Promise.reject(new Error((error === null || error === void 0 ? void 0 : error.message) || 'Unable to perform this transaction at the moment. Try again later'));
+    const message = (error === null || error === void 0 ? void 0 : (_message = error.message) === null || _message === void 0 ? void 0 : (_message$toLowerCase = _message.toLowerCase) === null || _message$toLowerCase === void 0 ? void 0 : _message$toLowerCase.call(_message)) || '';
+    if (!message.includes('amount')) {
+      return Promise.reject(new Error('Unable to perform this transaction at the moment. Try again later'));
+    }
+    return Promise.reject(new Error(error === null || error === void 0 ? void 0 : error.message));
   }
 };

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

@@ -268,9 +268,6 @@ export class ChainOnlineService {
           this.chainService.subscribeChainInfoMap().next(chainInfoMap);
           this.chainService.setAssetRegistry(assetRegistry);
           this.chainService.subscribeAssetRegistry().next(assetRegistry);
-          this.chainService.autoEnableTokens().then(() => {
-            this.eventService.emit('asset.updateState', '');
-          }).catch(console.error);
           this.chainService.setChainStateMap(currentChainStateMap);
           this.chainService.subscribeChainStateMap().next(currentChainStateMap);
           this.chainService.subscribeChainStatusMap().next(currentChainStatusMap);

package/services/chain-service/index.d.ts

@@ -121,6 +121,7 @@ export declare class ChainService {
     stopCheckLatestChainData(): void;
     handleLatestChainData(latestChainInfo: _ChainInfo[]): void;
     autoEnableTokens(): Promise<void>;
+    resetPopularTokenList(): void;
     enablePopularTokens(): Promise<void>;
     handleLatestLedgerGenericAllowChains(latestledgerGenericAllowChains: string[]): void;
     handleLatestPriorityTokens(latestPriorityTokens: TokenPriorityDetails): void;