@subwallet/extension-base 1.1.11-1 → 1.1.12-1

package/background/KoniTypes.d.ts

@@ -7,7 +7,7 @@ import { _CHAIN_VALIDATION_ERROR } from '@subwallet/extension-base/services/chai
 import { _ChainState, _EvmApi, _NetworkUpsertParams, _SubstrateApi, _ValidateCustomAssetRequest, _ValidateCustomAssetResponse, EnableChainParams, EnableMultiChainParams } from '@subwallet/extension-base/services/chain-service/types';
 import { SWTransactionResponse, SWTransactionResult } from '@subwallet/extension-base/services/transaction-service/types';
 import { WalletConnectNotSupportRequest, WalletConnectSessionRequest } from '@subwallet/extension-base/services/wallet-connect-service/types';
-import { InjectedAccount, MetadataDefBase } from '@subwallet/extension-inject/types';
+import { InjectedAccount, InjectedAccountWithMeta, MetadataDefBase } from '@subwallet/extension-inject/types';
 import { KeyringPair$Json, KeyringPair$Meta } from '@subwallet/keyring/types';
 import { KeyringOptions } from '@subwallet/ui-keyring/options/types';
 import { KeyringAddress, KeyringPairs$Json } from '@subwallet/ui-keyring/types';
@@ -701,6 +701,12 @@ export interface RequestEditContactAccount {
 export interface RequestDeleteContactAccount {
     address: string;
 }
+export interface RequestAddInjectedAccounts {
+    accounts: InjectedAccountWithMeta[];
+}
+export interface RequestRemoveInjectedAccounts {
+    addresses: string[];
+}
 export declare enum ExternalRequestPromiseStatus {
     PENDING = 0,
     REJECTED = 1,
@@ -924,6 +930,7 @@ export interface EvmSendTransactionRequest extends TransactionConfig, EvmSignReq
     parseData: EvmTransactionData;
     isToContract: boolean;
 }
+export declare type EvmWatchTransactionRequest = EvmSendTransactionRequest;
 export interface ConfirmationsQueueItemOptions {
     requiredPassword?: boolean;
     address?: string;
@@ -981,6 +988,7 @@ export interface ConfirmationDefinitions {
     switchNetworkRequest: [ConfirmationsQueueItem<SwitchNetworkRequest>, ConfirmationResult<boolean>];
     evmSignatureRequest: [ConfirmationsQueueItem<EvmSignatureRequest>, ConfirmationResult<string>];
     evmSendTransactionRequest: [ConfirmationsQueueItem<EvmSendTransactionRequest>, ConfirmationResult<string>];
+    evmWatchTransactionRequest: [ConfirmationsQueueItem<EvmWatchTransactionRequest>, ConfirmationResult<string>];
 }
 export declare type ConfirmationType = keyof ConfirmationDefinitions;
 export declare type ConfirmationsQueue = {
@@ -1603,30 +1611,32 @@ export interface KoniRequestSignatures {
     'pri(authorize.forgetAllSite)': [null, boolean, AuthUrls];
     'pri(authorize.rejectV2)': [RequestAuthorizeReject, boolean];
     'pri(authorize.cancelV2)': [RequestAuthorizeCancel, boolean];
-    'pri(seed.createV2)': [RequestSeedCreateV2, ResponseSeedCreateV2];
     'pri(seed.validateV2)': [RequestSeedValidateV2, ResponseSeedValidateV2];
     'pri(privateKey.validateV2)': [RequestSeedValidateV2, ResponsePrivateKeyValidateV2];
+    'pri(accounts.checkPublicAndSecretKey)': [RequestCheckPublicAndSecretKey, ResponseCheckPublicAndSecretKey];
+    'pri(seed.createV2)': [RequestSeedCreateV2, ResponseSeedCreateV2];
     'pri(accounts.create.suriV2)': [RequestAccountCreateSuriV2, ResponseAccountCreateSuriV2];
     'pri(accounts.create.externalV2)': [RequestAccountCreateExternalV2, AccountExternalError[]];
     'pri(accounts.create.hardwareV2)': [RequestAccountCreateHardwareV2, boolean];
     'pri(accounts.create.hardwareMultiple)': [RequestAccountCreateHardwareMultiple, boolean];
     'pri(accounts.create.withSecret)': [RequestAccountCreateWithSecretKey, ResponseAccountCreateWithSecretKey];
+    'pri(accounts.inject.add)': [RequestAddInjectedAccounts, boolean];
+    'pri(accounts.inject.remove)': [RequestRemoveInjectedAccounts, boolean];
     'pri(derivation.createV2)': [RequestDeriveCreateV2, boolean];
     'pri(json.restoreV2)': [RequestJsonRestoreV2, void];
     'pri(json.batchRestoreV2)': [RequestBatchRestoreV2, void];
     'pri(accounts.exportPrivateKey)': [RequestAccountExportPrivateKey, ResponseAccountExportPrivateKey];
-    'pri(accounts.checkPublicAndSecretKey)': [RequestCheckPublicAndSecretKey, ResponseCheckPublicAndSecretKey];
     'pri(accounts.subscribeWithCurrentAddress)': [RequestAccountSubscribe, AccountsWithCurrentAddress, AccountsWithCurrentAddress];
-    'pri(accounts.subscribeAccountsInputAddress)': [RequestAccountSubscribe, string, OptionInputAddress];
-    'pri(accounts.saveRecent)': [RequestSaveRecentAccount, KeyringAddress];
-    'pri(accounts.get.meta)': [RequestAccountMeta, ResponseAccountMeta];
     'pri(accounts.updateCurrentAddress)': [string, boolean];
     'pri(currentAccount.saveAddress)': [RequestCurrentAccountAddress, CurrentAccountInfo];
+    'pri(accounts.get.meta)': [RequestAccountMeta, ResponseAccountMeta];
+    'pri(accounts.saveRecent)': [RequestSaveRecentAccount, KeyringAddress];
     'pri(accounts.subscribeAddresses)': [null, AddressBookInfo, AddressBookInfo];
     'pri(accounts.editContact)': [RequestEditContactAccount, boolean];
     'pri(accounts.deleteContact)': [RequestDeleteContactAccount, boolean];
     'pri(accounts.resolveDomainToAddress)': [ResolveDomainRequest, string | undefined];
     'pri(accounts.resolveAddressToDomain)': [ResolveAddressToDomainRequest, string | undefined];
+    'pri(accounts.subscribeAccountsInputAddress)': [RequestAccountSubscribe, string, OptionInputAddress];
     'pri(settings.changeBalancesVisibility)': [null, boolean];
     'pri(settings.subscribe)': [null, UiSettings, UiSettings];
     'pri(settings.getLogoMaps)': [null, AllLogoMap];

package/background/types.d.ts

@@ -31,17 +31,19 @@ export interface AbstractAddressJson extends KeyringPair$Meta {
 export interface AccountJson extends AbstractAddressJson {
     accountIndex?: number;
     addressOffset?: number;
+    availableGenesisHashes?: string[];
     genesisHash?: string | null;
     isExternal?: boolean;
     isHardware?: boolean;
     isHidden?: boolean;
+    isInjected?: boolean;
     isMasterAccount?: boolean;
     isMasterPassword?: boolean;
     isReadOnly?: boolean;
+    originGenesisHash?: string | null;
     parentAddress?: string;
+    source?: string;
     suri?: string;
-    originGenesisHash?: string | null;
-    availableGenesisHashes?: string[];
 }
 export interface AddressJson extends AbstractAddressJson {
     isRecent?: boolean;

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

@@ -33,6 +33,7 @@ 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/services/chain-service/utils");
 var _utils2 = require("@subwallet/extension-base/utils");
+var _number = require("@subwallet/extension-base/utils/number");
 var _i18next = require("i18next");
 var _util = require("@polkadot/util");
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
@@ -285,7 +286,7 @@ function getValidatorLabel(chain) {
 }
 const getMinStakeErrorMessage = (chainInfo, bnMinStake) => {
   const tokenInfo = (0, _utils._getChainNativeTokenBasicInfo)(chainInfo);
-  const number = bnMinStake.div(new _util.BN(10).pow(new _util.BN(tokenInfo.decimals))).toString();
+  const number = (0, _number.formatNumber)(bnMinStake.toString(), tokenInfo.decimals || 0, _number.balanceFormatter);
   return (0, _i18next.t)('Insufficient stake. Please stake at least {{number}} {{tokenSymbol}} to get rewards', {
     replace: {
       tokenSymbol: tokenInfo.symbol,

package/cjs/koni/api/tokens/evm/transfer.js

@@ -43,18 +43,24 @@ const handleTransferBalanceResult = _ref => {
   callback(response);
 };
 exports.handleTransferBalanceResult = handleTransferBalanceResult;
-async function getEVMTransactionObject(chainInfo, to, value, transferAll, evmApiMap) {
+async function getEVMTransactionObject(chainInfo, from, to, value, transferAll, evmApiMap) {
   const networkKey = chainInfo.slug;
   const web3Api = evmApiMap[networkKey];
   const gasPrice = await web3Api.api.eth.getGasPrice();
   const transactionObject = {
     gasPrice: gasPrice,
-    to: to
+    to: to,
+    value: value,
+    from: from
   };
   const gasLimit = await web3Api.api.eth.estimateGas(transactionObject);
   transactionObject.gas = gasLimit;
-  const estimateFee = parseInt(gasPrice) * gasLimit;
-  transactionObject.value = transferAll ? new _util.BN(value).add(new _util.BN(estimateFee).neg()) : value;
+  const estimateFee = new _util.BN(gasLimit).mul(new _util.BN(gasPrice));
+  transactionObject.value = transferAll ? new _util.BN(value).sub(estimateFee).toString() : value;
+  if (_constants.EVM_REFORMAT_DECIMALS.acala.includes(networkKey)) {
+    const numberReplace = 18 - 12;
+    transactionObject.value = transactionObject.value.substring(0, transactionObject.value.length - 6) + new Array(numberReplace).fill('0').join('');
+  }
   return [transactionObject, transactionObject.value.toString()];
 }
 async function getERC20TransactionObject(assetAddress, chainInfo, from, to, value, transferAll, evmApiMap) {

package/cjs/koni/background/handlers/Extension.js

@@ -1563,7 +1563,7 @@ class KoniExtension {
         if ((0, _utils._isTokenEvmSmartContract)(tokenInfo) || (0, _utils._isLocalToken)(tokenInfo)) {
           [transaction, transferAmount.value] = await (0, _transfer3.getERC20TransactionObject)((0, _utils._getContractAddressOfToken)(tokenInfo), chainInfo, from, to, txVal, !!transferAll, evmApiMap);
         } else {
-          [transaction, transferAmount.value] = await (0, _transfer3.getEVMTransactionObject)(chainInfo, to, txVal, !!transferAll, evmApiMap);
+          [transaction, transferAmount.value] = await (0, _transfer3.getEVMTransactionObject)(chainInfo, from, to, txVal, !!transferAll, evmApiMap);
         }
       } else if ((0, _utils._isMantaZkAsset)(tokenInfo)) {
         // TODO
@@ -2775,15 +2775,19 @@ class KoniExtension {
       if (createNew) {
         const pairs = _uiKeyring.keyring.getPairs();
         for (const pair of pairs) {
-          const meta = {
-            ...pair.meta,
-            isMasterPassword: false
-          };
-          if (!meta.originGenesisHash) {
-            meta.genesisHash = '';
+          if (pair.meta.isInjected) {
+            // Empty
+          } else {
+            const meta = {
+              ...pair.meta,
+              isMasterPassword: false
+            };
+            if (!meta.originGenesisHash) {
+              meta.genesisHash = '';
+            }
+            pair.setMeta(meta);
+            _uiKeyring.keyring.saveAccountMeta(pair, pair.meta);
           }
-          pair.setMeta(meta);
-          _uiKeyring.keyring.saveAccountMeta(pair, pair.meta);
         }
       }
       _uiKeyring.keyring.changeMasterPassword(newPassword, oldPassword);
@@ -2889,7 +2893,7 @@ class KoniExtension {
     }
   }
 
-  /// Signing external request
+  /// Signing substrate request
   signingApprovePasswordV2(_ref70) {
     let {
       id
@@ -3573,6 +3577,16 @@ class KoniExtension {
     return await (0, _domain.resolveAzeroAddressToDomain)(request.address, request.chain, chainApi.api);
   }
 
+  /// Inject account
+  addInjects(request) {
+    this.#koniState.keyringService.addInjectAccounts(request.accounts);
+    return true;
+  }
+  removeInjects(request) {
+    this.#koniState.keyringService.removeInjectAccounts(request.addresses);
+    return true;
+  }
+
   // --------------------------------------------------------------
   // eslint-disable-next-line @typescript-eslint/require-await
   async handle(id, type, request, port) {
@@ -3725,7 +3739,7 @@ class KoniExtension {
       case 'pri(transaction.history.getSubscription)':
         return await this.subscribeHistory(id, port);
 
-      /// Account management
+      /* Account management */
       // Add account
       case 'pri(accounts.create.suriV2)':
         return await this.accountsCreateSuriV2(request);
@@ -3788,6 +3802,14 @@ class KoniExtension {
       case 'pri(accounts.resolveAddressToDomain)':
         return await this.resolveAddressByDomain(request);
 
+      // Inject account
+      case 'pri(accounts.inject.add)':
+        return this.addInjects(request);
+      case 'pri(accounts.inject.remove)':
+        return this.removeInjects(request);
+
+      /* Account management */
+
       // ChainService
       case 'pri(chainService.subscribeChainInfoMap)':
         return this.subscribeChainInfoMap(id, port);

package/cjs/koni/background/handlers/State.js

@@ -1565,7 +1565,7 @@ class KoniState {
     });
   }
   async resetWallet(resetAll) {
-    this.keyringService.resetWallet(resetAll);
+    await this.keyringService.resetWallet(resetAll);
     this.requestService.resetWallet();
     this.transactionService.resetWallet();
     await this.dbService.resetWallet(resetAll);

package/cjs/packageInfo.js

@@ -13,6 +13,6 @@ const packageInfo = {
   name: '@subwallet/extension-base',
   path: typeof __dirname === 'string' ? __dirname : 'auto',
   type: 'cjs',
-  version: '1.1.11-1'
+  version: '1.1.12-1'
 };
 exports.packageInfo = packageInfo;

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports._ZK_ASSET_PREFIX = exports._XCM_TYPE = exports._XCM_CHAIN_GROUP = exports._TRANSFER_NOT_SUPPORTED_CHAINS = exports._TRANSFER_CHAIN_GROUP = exports._SUBSTRATE_DEFAULT_INFLATION_PARAMS = exports._STAKING_ERA_LENGTH_MAP = exports._STAKING_CHAIN_GROUP = exports._PURE_EVM_CHAINS = exports._PREDEFINED_SINGLE_MODES = exports._PARACHAIN_INFLATION_DISTRIBUTION = exports._NFT_CHAIN_GROUP = exports._MULTI_CHAIN_ASSET_SRC = exports._MANTA_ZK_CHAIN_GROUP = exports._KNOWN_CHAIN_INFLATION_PARAMS = exports._DEFAULT_MANTA_ZK_CHAIN = exports._DEFAULT_ACTIVE_CHAINS = exports._CHAIN_LOGO_MAP_SRC = exports._CHAIN_INFO_SRC = exports._CHAIN_ASSET_SRC = exports._BALANCE_TOKEN_GROUP = exports._BALANCE_PARSING_CHAIN_GROUP = exports._BALANCE_CHAIN_GROUP = exports._ASSET_REF_SRC = exports._ASSET_LOGO_MAP_SRC = exports._API_OPTIONS_CHAIN_GROUP = exports.API_MAX_RETRY = exports.API_CONNECT_TIMEOUT = exports.API_AUTO_CONNECT_MS = void 0;
+exports._ZK_ASSET_PREFIX = exports._XCM_TYPE = exports._XCM_CHAIN_GROUP = exports._TRANSFER_NOT_SUPPORTED_CHAINS = exports._TRANSFER_CHAIN_GROUP = exports._SUBSTRATE_DEFAULT_INFLATION_PARAMS = exports._STAKING_ERA_LENGTH_MAP = exports._STAKING_CHAIN_GROUP = exports._PURE_EVM_CHAINS = exports._PREDEFINED_SINGLE_MODES = exports._PARACHAIN_INFLATION_DISTRIBUTION = exports._NFT_CHAIN_GROUP = exports._MULTI_CHAIN_ASSET_SRC = exports._MANTA_ZK_CHAIN_GROUP = exports._KNOWN_CHAIN_INFLATION_PARAMS = exports._DEFAULT_MANTA_ZK_CHAIN = exports._DEFAULT_ACTIVE_CHAINS = exports._CHAIN_LOGO_MAP_SRC = exports._CHAIN_INFO_SRC = exports._CHAIN_ASSET_SRC = exports._BALANCE_TOKEN_GROUP = exports._BALANCE_PARSING_CHAIN_GROUP = exports._BALANCE_CHAIN_GROUP = exports._ASSET_REF_SRC = exports._ASSET_LOGO_MAP_SRC = exports._API_OPTIONS_CHAIN_GROUP = exports.EVM_REFORMAT_DECIMALS = exports.EVM_PASS_CONNECT_STATUS = exports.API_MAX_RETRY = exports.API_CONNECT_TIMEOUT = exports.API_AUTO_CONNECT_MS = void 0;
 var _chainList = require("@subwallet/chain-list");
 var _types = require("@subwallet/chain-list/types");
 var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
@@ -237,9 +237,17 @@ const _XCM_TYPE = {
 };
 exports._XCM_TYPE = _XCM_TYPE;
 const _DEFAULT_ACTIVE_CHAINS = [..._chainList._DEFAULT_CHAINS];
+exports._DEFAULT_ACTIVE_CHAINS = _DEFAULT_ACTIVE_CHAINS;
+const EVM_PASS_CONNECT_STATUS = {
+  acala: ['acala_evm', 'karura_evm']
+};
+exports.EVM_PASS_CONNECT_STATUS = EVM_PASS_CONNECT_STATUS;
+const EVM_REFORMAT_DECIMALS = {
+  acala: ['acala_evm', 'karura_evm']
+};
 
 // TODO: review
-exports._DEFAULT_ACTIVE_CHAINS = _DEFAULT_ACTIVE_CHAINS;
+exports.EVM_REFORMAT_DECIMALS = EVM_REFORMAT_DECIMALS;
 const TARGET_BRANCH = process.env.NODE_ENV !== 'production' ? 'koni-dev' : 'master';
 const _CHAIN_INFO_SRC = `https://raw.githubusercontent.com/Koniverse/SubWallet-Chain/${TARGET_BRANCH}/packages/chain-list/src/data/ChainInfo.json`;
 exports._CHAIN_INFO_SRC = _CHAIN_INFO_SRC;

package/cjs/services/chain-service/handler/EvmApi.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.EvmApi = void 0;
 require("@polkadot/types-augment");
+var _constants = require("@subwallet/extension-base/services/chain-service/constants");
 var _types = require("@subwallet/extension-base/services/chain-service/types");
 var _promise = require("@subwallet/extension-base/utils/promise");
 var _rxjs = require("rxjs");
@@ -13,6 +14,7 @@ var _web = _interopRequireDefault(require("web3"));
 // Copyright 2019-2022 @subwallet/extension-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+const acalaEvmNetworks = _constants.EVM_PASS_CONNECT_STATUS.acala;
 class EvmApi {
   apiRetry = 0;
   isApiConnectedSubject = new _rxjs.BehaviorSubject(false);
@@ -75,11 +77,15 @@ class EvmApi {
   createIntervalCheckApi() {
     this.clearIntervalCheckApi();
     return setInterval(() => {
-      this.api.eth.net.isListening().then(() => {
+      if (!acalaEvmNetworks.includes(this.chainSlug)) {
+        this.api.eth.net.isListening().then(() => {
+          this.onConnect();
+        }).catch(() => {
+          this.onDisconnect();
+        });
+      } else {
         this.onConnect();
-      }).catch(() => {
-        this.onDisconnect();
-      });
+      }
     }, 10000);
   }
   clearIntervalCheckApi() {
@@ -90,17 +96,23 @@ class EvmApi {
     const wsProvider = this.provider;
     wsProvider.connect && wsProvider.connect();
     this.updateConnectionStatus(_types._ChainConnectionStatus.CONNECTING);
+
     // Check if api is ready
-    this.api.eth.net.isListening().then(() => {
+    if (!acalaEvmNetworks.includes(this.chainSlug)) {
+      this.api.eth.net.isListening().then(() => {
+        this.isApiReadyOnce = true;
+        this.onConnect();
+      }).catch(error => {
+        this.isApiReadyOnce = false;
+        this.isApiReady = false;
+        this.isReadyHandler.reject(error);
+        this.updateConnectionStatus(_types._ChainConnectionStatus.DISCONNECTED);
+        console.warn(`Can not connect to ${this.chainSlug} (EVM) at ${this.apiUrl}`);
+      });
+    } else {
       this.isApiReadyOnce = true;
       this.onConnect();
-    }).catch(error => {
-      this.isApiReadyOnce = false;
-      this.isApiReady = false;
-      this.isReadyHandler.reject(error);
-      this.updateConnectionStatus(_types._ChainConnectionStatus.DISCONNECTED);
-      console.warn(`Can not connect to ${this.chainSlug} (EVM) at ${this.apiUrl}`);
-    });
+    }
 
     // Interval to check connecting status
     this.intervalCheckApi = this.createIntervalCheckApi();

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

@@ -8,6 +8,7 @@ var _constants = require("@subwallet/extension-base/constants");
 var _stores = require("@subwallet/extension-base/stores");
 var _uiKeyring = require("@subwallet/ui-keyring");
 var _rxjs = require("rxjs");
+var _util = require("@polkadot/util");
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
@@ -98,8 +99,39 @@ class KeyringService {
     _uiKeyring.keyring.lockAll();
     this.updateKeyringState();
   }
-  resetWallet(resetAll) {
+
+  /* Inject */
+
+  addInjectAccounts(accounts) {
+    _uiKeyring.keyring.addInjects(accounts.map(account => {
+      const name = account.meta.name || (0, _util.stringShorten)(account.address);
+
+      // TODO: Add if need
+      // name = name.concat(' (', account.meta.source, ')');
+
+      return {
+        ...account,
+        meta: {
+          ...account.meta,
+          name: name
+        }
+      };
+    }));
+  }
+  removeInjectAccounts(addresses) {
+    _uiKeyring.keyring.removeInjects(addresses);
+  }
+
+  /* Inject */
+
+  /* Reset */
+  async resetWallet(resetAll) {
     _uiKeyring.keyring.resetWallet(resetAll);
+    await new Promise(resolve => {
+      setTimeout(() => {
+        resolve();
+      }, 500);
+    });
     this.updateKeyringState();
     this.currentAccountSubject.next({
       address: _constants.ALL_ACCOUNT_KEY,

package/cjs/services/notification-service/NotificationService.js

@@ -32,7 +32,8 @@ class NotificationService {
 
   // Create a new chrome notification with link
   static createBrowserNotification(title, message, link) {
-    chrome.notifications.create({
+    var _chrome, _chrome$notifications;
+    (_chrome = chrome) === null || _chrome === void 0 ? void 0 : (_chrome$notifications = _chrome.notifications) === null || _chrome$notifications === void 0 ? void 0 : _chrome$notifications.create({
       type: 'basic',
       title,
       message,

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.PREDEFINED_CHAIN_DAPP_CHAIN_MAP = exports.EXTENSION_REQUEST_URL = void 0;
+exports.WEB_APP_URL = exports.PREDEFINED_CHAIN_DAPP_CHAIN_MAP = exports.EXTENSION_REQUEST_URL = void 0;
 // Copyright 2019-2022 @subwallet/extension-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
@@ -14,4 +14,13 @@ const PREDEFINED_CHAIN_DAPP_CHAIN_MAP = {
   'apps.moonbeam.network': ['moonbeam', 'moonriver'],
   'app.stellaswap.com': ['moonbeam']
 };
-exports.PREDEFINED_CHAIN_DAPP_CHAIN_MAP = PREDEFINED_CHAIN_DAPP_CHAIN_MAP;
+exports.PREDEFINED_CHAIN_DAPP_CHAIN_MAP = PREDEFINED_CHAIN_DAPP_CHAIN_MAP;
+const WEB_APP_URL = [
+/// Web app
+'localhost:9000',
+// Local
+'subwallet-webapp.pages.dev',
+// Pull request build
+'web.subwallet.app' // Production
+];
+exports.WEB_APP_URL = WEB_APP_URL;

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

@@ -221,7 +221,7 @@ class AuthRequestHandler {
     }
     const idStr = (0, _utils2.stripUrl)(url);
     // Do not enqueue duplicate authorization requests.
-    const isDuplicate = Object.values(this.#authRequestsV2).some(request => request.idStr === idStr);
+    const isDuplicate = Object.values(this.#authRequestsV2).some(_request => _request.idStr === idStr && _request.accountAuthType === request.accountAuthType);
     (0, _util.assert)(!isDuplicate, 'The source {{url}} has a pending authorization request'.replace('{{url}}', url));
     const existedAuth = authList[idStr];
     const existedAccountAuthType = existedAuth === null || existedAuth === void 0 ? void 0 : existedAuth.accountAuthType;
@@ -250,6 +250,25 @@ class AuthRequestHandler {
         // Prevent appear confirmation popup
         return false;
       }
+    } else {
+      // Auto auth for web app
+
+      // Ignore white list
+      const isWhiteList = _constants.WEB_APP_URL.some(url => idStr.includes(url)) && false;
+      if (isWhiteList) {
+        const isAllowedMap = this.getAddressList(true);
+        authList[(0, _utils2.stripUrl)(url)] = {
+          count: 0,
+          id: idStr,
+          isAllowed: true,
+          isAllowedMap,
+          origin,
+          url,
+          accountAuthType: 'both'
+        };
+        this.setAuthorize(authList);
+        return true;
+      }
     }
     return new Promise((resolve, reject) => {
       const id = (0, _getId.getId)();

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

@@ -28,7 +28,8 @@ class EvmRequestHandler {
     addTokenRequest: {},
     switchNetworkRequest: {},
     evmSignatureRequest: {},
-    evmSendTransactionRequest: {}
+    evmSendTransactionRequest: {},
+    evmWatchTransactionRequest: {}
   });
   confirmationsPromiseMap = {};
   constructor(requestService) {

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

@@ -18,7 +18,7 @@ class SettingService {
   passPhishingStore = new _PassPhishingStore.default();
   constructor() {
     let old = localStorage.getItem(_constants.LANGUAGE) || 'en';
-    this.settingsStore.getSubject().subscribe(_ref => {
+    const updateLanguage = _ref => {
       let {
         language
       } = _ref;
@@ -26,6 +26,10 @@ class SettingService {
         old = language;
         _i18n.default.changeLanguage(language).catch(console.error);
       }
+    };
+    this.getSettings(updateLanguage);
+    this.settingsStore.getSubject().subscribe({
+      next: updateLanguage
     });
   }
   getSubject() {