@subwallet/extension-base 1.1.9-0 → 1.1.11-0

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

@@ -42,6 +42,7 @@ var _uiKeyring = require("@subwallet/ui-keyring");
 var _utils3 = require("@walletconnect/utils");
 var _bignumber = _interopRequireDefault(require("bignumber.js"));
 var _ethereumjsTx = require("ethereumjs-tx");
+var _i18next = require("i18next");
 var _types3 = require("@polkadot/types");
 var _util = require("@polkadot/util");
 var _utilCrypto = require("@polkadot/util-crypto");
@@ -77,16 +78,31 @@ class KoniExtension {
   #koniState;
   #timeAutoLock = _constants4.DEFAULT_AUTO_LOCK_TIME;
   #skipAutoLock = false;
+  #alwaysLock = false;
+  #firstTime = true;
   constructor(state) {
     this.#koniState = state;
     const updateTimeAutoLock = rs => {
-      this.#timeAutoLock = rs.timeAutoLock;
-      clearTimeout(this.#lockTimeOut);
-      this.#lockTimeOut = setTimeout(() => {
-        if (!this.#skipAutoLock) {
-          this.keyringLock();
+      // Check time auto lock change
+      if (this.#timeAutoLock !== rs.timeAutoLock) {
+        this.#timeAutoLock = rs.timeAutoLock;
+        this.#alwaysLock = !rs.timeAutoLock;
+        clearTimeout(this.#lockTimeOut);
+        if (this.#timeAutoLock > 0) {
+          this.#lockTimeOut = setTimeout(() => {
+            if (!this.#skipAutoLock) {
+              this.keyringLock();
+            }
+          }, this.#timeAutoLock * 60 * 1000);
+        } else if (this.#alwaysLock) {
+          if (!this.#firstTime) {
+            this.keyringLock();
+          }
         }
-      }, this.#timeAutoLock * 60 * 1000);
+      }
+      if (this.#firstTime) {
+        this.#firstTime = false;
+      }
     };
     this.#koniState.settingService.getSettings(updateTimeAutoLock);
     this.#koniState.settingService.getSubject().subscribe({
@@ -144,14 +160,14 @@ class KoniExtension {
       oldPass
     } = _ref5;
     const pair = _uiKeyring.keyring.getPair(address);
-    (0, _util.assert)(pair, 'Unable to find pair');
+    (0, _util.assert)(pair, (0, _i18next.t)('Unable to find account'));
     try {
       if (!pair.isLocked) {
         pair.lock();
       }
       pair.decodePkcs8(oldPass);
     } catch (error) {
-      throw new Error('oldPass is invalid');
+      throw new Error((0, _i18next.t)('Wrong password'));
     }
     _uiKeyring.keyring.encryptAccount(pair, newPass);
     return true;
@@ -162,7 +178,7 @@ class KoniExtension {
       name
     } = _ref6;
     const pair = _uiKeyring.keyring.getPair(address);
-    (0, _util.assert)(pair, 'Unable to find pair');
+    (0, _util.assert)(pair, (0, _i18next.t)('Unable to find account'));
     _uiKeyring.keyring.saveAccountMeta(pair, {
       ...pair.meta,
       name
@@ -184,7 +200,7 @@ class KoniExtension {
       isShowing
     } = _ref8;
     const pair = _uiKeyring.keyring.getPair(address);
-    (0, _util.assert)(pair, 'Unable to find pair');
+    (0, _util.assert)(pair, (0, _i18next.t)('Unable to find account'));
     _uiKeyring.keyring.saveAccountMeta(pair, {
       ...pair.meta,
       isHidden: !isShowing
@@ -220,7 +236,7 @@ class KoniExtension {
       id
     } = _ref10;
     const queued = this.#koniState.getMetaRequest(id);
-    (0, _util.assert)(queued, 'Unable to find request');
+    (0, _util.assert)(queued, (0, _i18next.t)('Unable to proceed. Please try again'));
     const {
       request,
       resolve
@@ -240,7 +256,7 @@ class KoniExtension {
       id
     } = _ref11;
     const queued = this.#koniState.getMetaRequest(id);
-    (0, _util.assert)(queued, 'Unable to find request');
+    (0, _util.assert)(queued, (0, _i18next.t)('Unable to proceed. Please try again'));
     const {
       reject
     } = queued;
@@ -320,11 +336,15 @@ class KoniExtension {
       phrase
     } = (0, _utilCrypto.keyExtractSuri)(suri);
     if ((0, _util.isHex)(phrase)) {
-      (0, _util.assert)((0, _util.isHex)(phrase, 256), 'Hex seed needs to be 256-bits');
+      (0, _util.assert)((0, _util.isHex)(phrase, 256), (0, _i18next.t)('Invalid seed phrase. Please try again.'));
     } else {
       // sadly isHex detects as string, so we need a cast here
-      (0, _util.assert)(_Extension.SEED_LENGTHS.includes(phrase.split(' ').length), `Mnemonic needs to contain ${_Extension.SEED_LENGTHS.join(', ')} words`);
-      (0, _util.assert)((0, _utilCrypto.mnemonicValidate)(phrase), 'Not a valid mnemonic seed');
+      (0, _util.assert)(_Extension.SEED_LENGTHS.includes(phrase.split(' ').length), (0, _i18next.t)('Seed phrase needs to contain {{x}} words', {
+        replace: {
+          x: _Extension.SEED_LENGTHS.join(', ')
+        }
+      }));
+      (0, _util.assert)((0, _utilCrypto.mnemonicValidate)(phrase), (0, _i18next.t)('Invalid seed phrase. Please try again.'));
     }
     return {
       address: _uiKeyring.keyring.createFromUri(getSuri(suri, type), {}, type).address,
@@ -339,7 +359,7 @@ class KoniExtension {
       signature
     } = _ref16;
     const queued = this.#koniState.getSignRequest(id);
-    (0, _util.assert)(queued, 'Unable to find request');
+    (0, _util.assert)(queued, (0, _i18next.t)('Unable to proceed. Please try again'));
     const {
       resolve
     } = queued;
@@ -356,7 +376,7 @@ class KoniExtension {
       id
     } = _ref17;
     const queued = this.#koniState.getSignRequest(id);
-    (0, _util.assert)(queued, 'Unable to find request');
+    (0, _util.assert)(queued, (0, _i18next.t)('Unable to proceed. Please try again'));
     const {
       reject
     } = queued;
@@ -406,12 +426,16 @@ class KoniExtension {
     try {
       parentPair.decodePkcs8(password);
     } catch (e) {
-      throw new Error('invalid password');
+      throw new Error((0, _i18next.t)('Wrong password'));
     }
     try {
       return parentPair.derive(suri, metadata);
     } catch (err) {
-      throw new Error(`"${suri}" is not a valid derivation path`);
+      throw new Error((0, _i18next.t)('"{{suri}}" is not a valid derivation path', {
+        replace: {
+          suri
+        }
+      }));
     }
   }
   derivationValidate(_ref19) {
@@ -549,7 +573,7 @@ class KoniExtension {
         publicKey: (0, _utilCrypto.decodeAddress)(address)
       };
     } else {
-      throw Error('Invalid address');
+      throw Error((0, _i18next.t)('This is not an address'));
     }
   }
   editContactAccount(_ref23) {
@@ -562,7 +586,7 @@ class KoniExtension {
       _uiKeyring.keyring.saveAddress(_address, meta);
       return true;
     } else {
-      throw Error('Invalid address');
+      throw Error((0, _i18next.t)('This is not an address'));
     }
   }
   deleteContactAccount(_ref24) {
@@ -574,7 +598,7 @@ class KoniExtension {
       _uiKeyring.keyring.forgetAddress(_address);
       return true;
     } else {
-      throw Error('Invalid address');
+      throw Error((0, _i18next.t)('This is not an address'));
     }
   }
   _getAuthListV2() {
@@ -623,7 +647,7 @@ class KoniExtension {
       id
     } = _ref25;
     const queued = this.#koniState.getAuthRequestV2(id);
-    (0, _util.assert)(queued, 'Unable to find request');
+    (0, _util.assert)(queued, (0, _i18next.t)('Unable to proceed. Please try again'));
     const {
       resolve
     } = queued;
@@ -638,7 +662,7 @@ class KoniExtension {
       id
     } = _ref26;
     const queued = this.#koniState.getAuthRequestV2(id);
-    (0, _util.assert)(queued, 'Unable to find request');
+    (0, _util.assert)(queued, (0, _i18next.t)('Unable to proceed. Please try again'));
     const {
       reject
     } = queued;
@@ -650,7 +674,7 @@ class KoniExtension {
       id
     } = _ref27;
     const queued = this.#koniState.getAuthRequestV2(id);
-    (0, _util.assert)(queued, 'Unable to find request');
+    (0, _util.assert)(queued, (0, _i18next.t)('Unable to proceed. Please try again'));
     const {
       reject
     } = queued;
@@ -887,6 +911,13 @@ class KoniExtension {
     this.#koniState.updateSetting('timeAutoLock', autoLockTime);
     return true;
   }
+  setUnlockType(_ref30) {
+    let {
+      unlockType
+    } = _ref30;
+    this.#koniState.updateSetting('unlockType', unlockType);
+    return true;
+  }
   async subscribeSettings(id, port) {
     const cb = (0, _subscriptions.createSubscription)(id, port);
     const balancesVisibilitySubscription = this.#koniState.subscribeSettingsSubject().subscribe({
@@ -900,31 +931,31 @@ class KoniExtension {
     });
     return await this.getSettings();
   }
-  setEnableChainPatrol(_ref30) {
+  setEnableChainPatrol(_ref31) {
     let {
       enable
-    } = _ref30;
+    } = _ref31;
     this.#koniState.updateSetting('enableChainPatrol', enable);
     return true;
   }
-  setShowZeroBalance(_ref31) {
+  setShowZeroBalance(_ref32) {
     let {
       show
-    } = _ref31;
+    } = _ref32;
     this.#koniState.updateSetting('isShowZeroBalance', show);
     return true;
   }
-  setLanguage(_ref32) {
+  setLanguage(_ref33) {
     let {
       language
-    } = _ref32;
+    } = _ref33;
     this.#koniState.updateSetting('language', language);
     return true;
   }
-  setShowBalance(_ref33) {
+  setShowBalance(_ref34) {
     let {
       enable
-    } = _ref33;
+    } = _ref34;
     this.#koniState.updateSetting('isShowBalance', enable);
     return true;
   }
@@ -1100,7 +1131,7 @@ class KoniExtension {
       }
     });
   }
-  async accountsCreateSuriV2(_ref34) {
+  async accountsCreateSuriV2(_ref35) {
     let {
       genesisHash,
       isAllowed,
@@ -1108,13 +1139,13 @@ class KoniExtension {
       password,
       suri: _suri,
       types
-    } = _ref34;
+    } = _ref35;
     const addressDict = {};
     let changedAccount = false;
     const hasMasterPassword = _uiKeyring.keyring.keyring.hasMasterPassword;
     if (!hasMasterPassword) {
       if (!password) {
-        throw Error('Require password to set up master password');
+        throw Error((0, _i18next.t)('The password of each account is needed to set up master password'));
       } else {
         _uiKeyring.keyring.changeMasterPassword(password);
         this.#koniState.updateKeyringState();
@@ -1154,12 +1185,15 @@ class KoniExtension {
         resolve();
       });
     });
+    if (this.#alwaysLock) {
+      this.keyringLock();
+    }
     return addressDict;
   }
-  async accountsForgetOverride(_ref35) {
+  async accountsForgetOverride(_ref36) {
     let {
       address
-    } = _ref35;
+    } = _ref36;
     _uiKeyring.keyring.forgetAccount(address);
     await new Promise(resolve => {
       this.#koniState.removeAccountRef(address, () => {
@@ -1192,12 +1226,12 @@ class KoniExtension {
     await this.#koniState.disableMantaPay(address);
     return true;
   }
-  seedCreateV2(_ref36) {
+  seedCreateV2(_ref37) {
     let {
       length = _Extension.SEED_DEFAULT_LENGTH,
       seed: _seed,
       types
-    } = _ref36;
+    } = _ref37;
     const seed = _seed || (0, _utilCrypto.mnemonicGenerate)(length);
     const rs = {
       seed: seed,
@@ -1208,20 +1242,24 @@ class KoniExtension {
     });
     return rs;
   }
-  seedValidateV2(_ref37) {
+  seedValidateV2(_ref38) {
     let {
       suri,
       types
-    } = _ref37;
+    } = _ref38;
     const {
       phrase
     } = (0, _utilCrypto.keyExtractSuri)(suri);
     if ((0, _util.isHex)(phrase)) {
-      (0, _util.assert)((0, _util.isHex)(phrase, 256), 'Hex seed needs to be 256-bits');
+      (0, _util.assert)((0, _util.isHex)(phrase, 256), (0, _i18next.t)('Invalid seed phrase. Please try again.'));
     } else {
       // sadly isHex detects as string, so we need a cast here
-      (0, _util.assert)(_Extension.SEED_LENGTHS.includes(phrase.split(' ').length), `Mnemonic needs to contain ${_Extension.SEED_LENGTHS.join(', ')} words`);
-      (0, _util.assert)((0, _utilCrypto.mnemonicValidate)(phrase), 'Not a valid mnemonic seed');
+      (0, _util.assert)(_Extension.SEED_LENGTHS.includes(phrase.split(' ').length), (0, _i18next.t)('Seed phrase needs to contain {{x}} words', {
+        replace: {
+          x: _Extension.SEED_LENGTHS.join(', ')
+        }
+      }));
+      (0, _util.assert)((0, _utilCrypto.mnemonicValidate)(phrase), (0, _i18next.t)('Invalid seed phrase. Please try again.'));
     }
     const rs = {
       seed: suri,
@@ -1232,11 +1270,11 @@ class KoniExtension {
     });
     return rs;
   }
-  _checkValidatePrivateKey(_ref38) {
+  _checkValidatePrivateKey(_ref39) {
     let {
       suri,
       types
-    } = _ref38;
+    } = _ref39;
     let autoAddPrefix = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
     const {
       phrase
@@ -1255,15 +1293,15 @@ class KoniExtension {
       });
     } else {
       rs.autoAddPrefix = false;
-      (0, _util.assert)(false, 'Not valid private key');
+      (0, _util.assert)(false, (0, _i18next.t)('Invalid private key. Please try again.'));
     }
     return rs;
   }
-  metamaskPrivateKeyValidateV2(_ref39) {
+  metamaskPrivateKeyValidateV2(_ref40) {
     let {
       suri,
       types
-    } = _ref39;
+    } = _ref40;
     const isValidSuri = suri.startsWith('0x');
     if (isValidSuri) {
       return this._checkValidatePrivateKey({
@@ -1285,17 +1323,21 @@ class KoniExtension {
     try {
       return parentPair.derive(suri, metadata);
     } catch (err) {
-      throw new Error(`"${suri}" is not a valid derivation path`);
+      throw new Error((0, _i18next.t)('"{{suri}}" is not a valid derivation path', {
+        replace: {
+          suri
+        }
+      }));
     }
   }
-  derivationCreateV2(_ref40) {
+  derivationCreateV2(_ref41) {
     let {
       genesisHash,
       isAllowed,
       name,
       parentAddress,
       suri
-    } = _ref40;
+    } = _ref41;
     const childPair = this.deriveV2(parentAddress, suri, {
       genesisHash,
       name,
@@ -1309,14 +1351,14 @@ class KoniExtension {
     });
     return true;
   }
-  jsonRestoreV2(_ref41) {
+  jsonRestoreV2(_ref42) {
     let {
       address,
       file,
       isAllowed,
       password,
       withMasterPassword
-    } = _ref41;
+    } = _ref42;
     const isPasswordValidated = this.validatePassword(file, password);
     if (isPasswordValidated) {
       try {
@@ -1324,20 +1366,23 @@ class KoniExtension {
           _uiKeyring.keyring.restoreAccount(file, password, withMasterPassword);
           this._addAddressToAuthList(address, isAllowed);
         });
+        if (this.#alwaysLock) {
+          this.keyringLock();
+        }
       } catch (error) {
         throw new Error(error.message);
       }
     } else {
-      throw new Error('Unable to decode using the supplied passphrase');
+      throw new Error((0, _i18next.t)('Wrong password'));
     }
   }
-  batchRestoreV2(_ref42) {
+  batchRestoreV2(_ref43) {
     let {
       accountsInfo,
       file,
       isAllowed,
       password
-    } = _ref42;
+    } = _ref43;
     const addressList = accountsInfo.map(acc => acc.address);
     const isPasswordValidated = this.validatedAccountsPassword(file, password);
     if (isPasswordValidated) {
@@ -1346,11 +1391,14 @@ class KoniExtension {
           _uiKeyring.keyring.restoreAccounts(file, password);
           this._addAddressesToAuthList(addressList, isAllowed);
         });
+        if (this.#alwaysLock) {
+          this.keyringLock();
+        }
       } catch (error) {
         throw new Error(error.message);
       }
     } else {
-      throw new Error('Unable to decode using the supplied passphrase');
+      throw new Error((0, _i18next.t)('Wrong password'));
     }
   }
   getNftCollection() {
@@ -1457,7 +1505,7 @@ class KoniExtension {
     let transferValue;
     if (!transferAll) {
       if (value === undefined) {
-        errors.push(new _TransactionError.TransactionError(_KoniTypes.BasicTxErrorType.INVALID_PARAMS, 'Require transfer value'));
+        errors.push(new _TransactionError.TransactionError(_KoniTypes.BasicTxErrorType.INVALID_PARAMS, (0, _i18next.t)('Transfer amount is required')));
       }
       if (value) {
         transferValue = new _util.BN(value);
@@ -1465,10 +1513,10 @@ class KoniExtension {
     }
     const tokenInfo = this.#koniState.getAssetBySlug(tokenSlug);
     if (!tokenInfo) {
-      errors.push(new _TransactionError.TransactionError(_KoniTypes.BasicTxErrorType.INVALID_PARAMS, 'Not found token from registry'));
+      errors.push(new _TransactionError.TransactionError(_KoniTypes.BasicTxErrorType.INVALID_PARAMS, (0, _i18next.t)('Not found token from registry')));
     }
     if ((0, _utilCrypto.isEthereumAddress)(from) && (0, _utilCrypto.isEthereumAddress)(to) && (0, _utils._isTokenEvmSmartContract)(tokenInfo) && (0, _utils._getContractAddressOfToken)(tokenInfo).length === 0) {
-      errors.push(new _TransactionError.TransactionError(_KoniTypes.BasicTxErrorType.INVALID_PARAMS, 'Not found ERC20 address for this token'));
+      errors.push(new _TransactionError.TransactionError(_KoniTypes.BasicTxErrorType.INVALID_PARAMS, (0, _i18next.t)('Not found ERC20 address for this token')));
     }
     return [errors, keypair, transferValue, tokenInfo];
   }
@@ -1536,7 +1584,7 @@ class KoniExtension {
     } catch (e) {
       const error = e;
       if (error.message.includes('transfer amount exceeds balance')) {
-        error.message = 'Not enough balance';
+        error.message = (0, _i18next.t)('Insufficient balance');
       }
       throw error;
     }
@@ -1557,7 +1605,7 @@ class KoniExtension {
           token: tokenSlug
         });
         if (new _bignumber.default(balance).minus(transferAmount.value).lt(minAmount)) {
-          inputTransaction.warnings.push(new _TransactionWarning.TransactionWarning(_KoniTypes.BasicTxWarningCode.NOT_ENOUGH_EXISTENTIAL_DEPOSIT, ''));
+          inputTransaction.warnings.push(new _TransactionWarning.TransactionWarning(_KoniTypes.BasicTxWarningCode.NOT_ENOUGH_EXISTENTIAL_DEPOSIT));
         }
       }
       const {
@@ -1572,7 +1620,12 @@ class KoniExtension {
       if (new _bignumber.default(receiverBalance).plus(transferAmount.value).lt(minAmount)) {
         const atLeast = new _bignumber.default(minAmount).minus(receiverBalance).plus((tokenInfo.decimals || 0) === 0 ? 0 : 1);
         const atLeastStr = (0, _number.formatNumber)(atLeast, tokenInfo.decimals || 0, _number.balanceFormatter);
-        inputTransaction.errors.push(new _TransactionError.TransactionError(_KoniTypes.TransferTxErrorType.RECEIVER_NOT_ENOUGH_EXISTENTIAL_DEPOSIT, `You must transfer at least ${atLeastStr} ${tokenInfo.symbol} to keep the destination account alive`));
+        inputTransaction.errors.push(new _TransactionError.TransactionError(_KoniTypes.TransferTxErrorType.RECEIVER_NOT_ENOUGH_EXISTENTIAL_DEPOSIT, (0, _i18next.t)('You must transfer at least {{amount}}{{symbol}} to keep the destination account alive', {
+          replace: {
+            amount: atLeastStr,
+            symbol: tokenInfo.symbol
+          }
+        })));
       }
     };
     return this.#koniState.transactionService.handleTransaction({
@@ -1598,7 +1651,7 @@ class KoniExtension {
     const originTokenInfo = this.#koniState.getAssetBySlug(sendingTokenSlug);
     const destinationTokenInfo = this.#koniState.getXcmEqualAssetByChain(destinationNetworkKey, sendingTokenSlug);
     if (!destinationTokenInfo) {
-      errors.push(new _TransactionError.TransactionError(_KoniTypes.TransferTxErrorType.INVALID_TOKEN, 'Not found token from registry'));
+      errors.push(new _TransactionError.TransactionError(_KoniTypes.TransferTxErrorType.INVALID_TOKEN, (0, _i18next.t)('Not found token from registry')));
     }
     return [errors, keypair, transferValue, originTokenInfo, destinationTokenInfo];
   }
@@ -1636,7 +1689,12 @@ class KoniExtension {
         // Check ed for receiver
         if (new _bignumber.default(value).lt(atLeast)) {
           const atLeastStr = (0, _number.formatNumber)(atLeast, destinationTokenInfo.decimals || 0, _number.balanceFormatter);
-          inputTransaction.errors.push(new _TransactionError.TransactionError(_KoniTypes.TransferTxErrorType.RECEIVER_NOT_ENOUGH_EXISTENTIAL_DEPOSIT, `You must transfer at least ${atLeastStr} ${originTokenInfo.symbol} to keep the destination account alive`));
+          inputTransaction.errors.push(new _TransactionError.TransactionError(_KoniTypes.TransferTxErrorType.RECEIVER_NOT_ENOUGH_EXISTENTIAL_DEPOSIT, (0, _i18next.t)('You must transfer at least {{amount}}{{symbol}} to keep the destination account alive', {
+            replace: {
+              amount: atLeastStr,
+              symbol: originTokenInfo.symbol
+            }
+          })));
         }
         const srcMinAmount = originTokenInfo.minAmount || '0';
         const isTransferNativeToken = originTokenInfo.assetType === _types._AssetType.NATIVE;
@@ -1651,7 +1709,7 @@ class KoniExtension {
             token: originTokenInfo.slug
           });
           if (new _bignumber.default(balance).minus(value).lt(srcMinAmount)) {
-            inputTransaction.warnings.push(new _TransactionWarning.TransactionWarning(_KoniTypes.BasicTxWarningCode.NOT_ENOUGH_EXISTENTIAL_DEPOSIT, ''));
+            inputTransaction.warnings.push(new _TransactionWarning.TransactionWarning(_KoniTypes.BasicTxWarningCode.NOT_ENOUGH_EXISTENTIAL_DEPOSIT));
           }
         }
       };
@@ -1728,21 +1786,21 @@ class KoniExtension {
   disableChain(networkKey) {
     return this.#koniState.disableChain(networkKey);
   }
-  async enableChain(_ref43) {
+  async enableChain(_ref44) {
     let {
       chainSlug,
       enableTokens
-    } = _ref43;
+    } = _ref44;
     return await this.#koniState.enableChain(chainSlug, enableTokens);
   }
   async reconnectChain(chainSlug) {
     return this.#koniState.chainService.reconnectChain(chainSlug);
   }
-  async validateNetwork(_ref44) {
+  async validateNetwork(_ref45) {
     let {
       existedChainSlug,
       provider
-    } = _ref44;
+    } = _ref45;
     return await this.#koniState.validateCustomChain(provider, existedChainSlug);
   }
   resetDefaultNetwork() {
@@ -1780,12 +1838,12 @@ class KoniExtension {
   async validateCustomAsset(data) {
     return await this.#koniState.validateCustomAsset(data);
   }
-  async getAddressFreeBalance(_ref45) {
+  async getAddressFreeBalance(_ref46) {
     let {
       address,
       networkKey,
       token
-    } = _ref45;
+    } = _ref46;
     if (token && _constants2._MANTA_ZK_CHAIN_GROUP.includes(networkKey)) {
       const tokenInfo = this.#koniState.chainService.getAssetBySlug(token);
       if (tokenInfo.symbol.startsWith(_constants2._ZK_ASSET_PREFIX)) {
@@ -1794,14 +1852,14 @@ class KoniExtension {
     }
     return await this.#koniState.balanceService.getTokenFreeBalance(address, networkKey, token);
   }
-  async transferGetMaxTransferable(_ref46) {
+  async transferGetMaxTransferable(_ref47) {
     let {
       address,
       destChain,
       isXcmTransfer,
       networkKey,
       token
-    } = _ref46;
+    } = _ref47;
     const freeBalance = await this.getAddressFreeBalance({
       address,
       networkKey,
@@ -1867,7 +1925,7 @@ class KoniExtension {
         }
       } catch (e) {
         estimatedFee = '0';
-        console.warn('Error estimating fee', e);
+        console.warn('Unable to estimate fee', e);
       }
       maxTransferable = maxTransferable.sub(new _util.BN(estimatedFee));
       return {
@@ -1876,12 +1934,12 @@ class KoniExtension {
       };
     }
   }
-  async subscribeAddressFreeBalance(_ref47, id, port) {
+  async subscribeAddressFreeBalance(_ref48, id, port) {
     let {
       address,
       networkKey,
       token
-    } = _ref47;
+    } = _ref48;
     const cb = (0, _subscriptions.createSubscription)(id, port);
     const [unsub, currentFreeBalance] = await this.#koniState.balanceService.subscribeTokenFreeBalance(address, networkKey, token, cb);
     this.createUnsubscriptionHandle(id, unsub);
@@ -1890,26 +1948,26 @@ class KoniExtension {
     });
     return currentFreeBalance;
   }
-  async transferCheckReferenceCount(_ref48) {
+  async transferCheckReferenceCount(_ref49) {
     let {
       address,
       networkKey
-    } = _ref48;
+    } = _ref49;
     // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-return
     return await (0, _transfer.checkReferenceCount)(networkKey, address, this.#koniState.getSubstrateApiMap(), this.#koniState.getChainInfo(networkKey));
   }
-  async transferCheckSupporting(_ref49) {
+  async transferCheckSupporting(_ref50) {
     let {
       networkKey,
       tokenSlug
-    } = _ref49;
+    } = _ref50;
     const tokenInfo = this.#koniState.getAssetBySlug(tokenSlug);
     return await (0, _transfer.checkSupportTransfer)(networkKey, tokenInfo, this.#koniState.getSubstrateApiMap(), this.#koniState.getChainInfo(networkKey));
   }
-  transferGetExistentialDeposit(_ref50) {
+  transferGetExistentialDeposit(_ref51) {
     let {
       tokenSlug
-    } = _ref50;
+    } = _ref51;
     const tokenInfo = this.#koniState.getAssetBySlug(tokenSlug);
     return (0, _utils._getTokenMinAmount)(tokenInfo);
   }
@@ -1945,11 +2003,11 @@ class KoniExtension {
       isSendingSelf
     };
   }
-  async enableChains(_ref51) {
+  async enableChains(_ref52) {
     let {
       chainSlugs,
       enableTokens
-    } = _ref51;
+    } = _ref52;
     try {
       await Promise.all(chainSlugs.map(chainSlug => this.enableChain({
         chainSlug,
@@ -1960,24 +2018,24 @@ class KoniExtension {
     }
     return true;
   }
-  getAccountMeta(_ref52) {
+  getAccountMeta(_ref53) {
     let {
       address
-    } = _ref52;
+    } = _ref53;
     const pair = _uiKeyring.keyring.getPair(address);
-    (0, _util.assert)(pair, 'Unable to find pair');
+    (0, _util.assert)(pair, (0, _i18next.t)('Unable to find account'));
     return {
       meta: pair.meta
     };
   }
-  accountsTie2(_ref53) {
+  accountsTie2(_ref54) {
     let {
       address,
       genesisHash
-    } = _ref53;
+    } = _ref54;
     return this.#koniState.setAccountTie(address, genesisHash);
   }
-  async accountsCreateExternalV2(_ref54) {
+  async accountsCreateExternalV2(_ref55) {
     let {
       address,
       genesisHash,
@@ -1985,7 +2043,7 @@ class KoniExtension {
       isEthereum,
       isReadOnly,
       name
-    } = _ref54;
+    } = _ref55;
     try {
       let result;
       try {
@@ -1994,7 +2052,7 @@ class KoniExtension {
           if (exists.type === (isEthereum ? 'ethereum' : 'sr25519')) {
             return [{
               code: _KoniTypes.AccountExternalErrorCode.INVALID_ADDRESS,
-              message: 'Account exists'
+              message: (0, _i18next.t)('Account exists')
             }];
           }
         }
@@ -2044,7 +2102,7 @@ class KoniExtension {
       }];
     }
   }
-  async accountsCreateHardwareV2(_ref55) {
+  async accountsCreateHardwareV2(_ref56) {
     let {
       accountIndex,
       address,
@@ -2053,7 +2111,7 @@ class KoniExtension {
       hardwareType,
       isAllowed,
       name
-    } = _ref55;
+    } = _ref56;
     const key = _uiKeyring.keyring.addHardware(address, hardwareType, {
       accountIndex,
       addressOffset,
@@ -2076,13 +2134,13 @@ class KoniExtension {
     });
     return true;
   }
-  async accountsCreateHardwareMultiple(_ref56) {
+  async accountsCreateHardwareMultiple(_ref57) {
     let {
       accounts
-    } = _ref56;
+    } = _ref57;
     const addresses = [];
     if (!accounts.length) {
-      throw new Error('No accounts to import');
+      throw new Error((0, _i18next.t)("Can't find an account. Please try again"));
     }
     const slugMap = {};
     for (const account of accounts) {
@@ -2157,14 +2215,14 @@ class KoniExtension {
     }
     return true;
   }
-  async accountsCreateWithSecret(_ref57) {
+  async accountsCreateWithSecret(_ref58) {
     let {
       isAllow,
       isEthereum,
       name,
       publicKey,
       secretKey
-    } = _ref57;
+    } = _ref58;
     try {
       let keyringPair = null;
       if (isEthereum) {
@@ -2195,7 +2253,7 @@ class KoniExtension {
           success: false,
           errors: [{
             code: _KoniTypes.AccountExternalErrorCode.KEYRING_ERROR,
-            message: 'Invalid keyring'
+            message: (0, _i18next.t)('Cannot create account')
           }]
         };
       }
@@ -2211,6 +2269,9 @@ class KoniExtension {
           resolve();
         });
       });
+      if (this.#alwaysLock) {
+        this.keyringLock();
+      }
       return {
         errors: [],
         success: true
@@ -2307,32 +2368,32 @@ class KoniExtension {
 
   // Parse transaction
 
-  parseSubstrateTransaction(_ref58) {
+  parseSubstrateTransaction(_ref59) {
     let {
       data,
       networkKey
-    } = _ref58;
+    } = _ref59;
     const apiProps = this.#koniState.getSubstrateApi(networkKey);
     const apiPromise = apiProps.api;
     return (0, _parseTransaction.parseSubstrateTransaction)(data, apiPromise);
   }
-  async parseEVMRLP(_ref59) {
+  async parseEVMRLP(_ref60) {
     let {
       data
-    } = _ref59;
+    } = _ref60;
     return await (0, _parseTransaction2.parseEvmRlp)(data, this.#koniState.getChainInfoMap(), this.#koniState.getEvmApiMap());
   }
 
   // Sign
 
-  qrSignSubstrate(_ref60) {
+  qrSignSubstrate(_ref61) {
     let {
       address,
       data,
       networkKey
-    } = _ref60;
+    } = _ref61;
     const pair = _uiKeyring.keyring.getPair(address);
-    (0, _util.assert)(pair, 'Unable to find pair');
+    (0, _util.assert)(pair, (0, _i18next.t)('Unable to find account'));
     if (pair.isLocked) {
       _uiKeyring.keyring.unlockPair(pair.address);
     }
@@ -2347,21 +2408,21 @@ class KoniExtension {
       signature: signed
     };
   }
-  async qrSignEVM(_ref61) {
+  async qrSignEVM(_ref62) {
     let {
       address,
       chainId,
       message,
       type
-    } = _ref61;
+    } = _ref62;
     let signed;
     const network = this.getNetworkJsonByChainId(chainId);
     if (!network) {
-      throw new Error('Cannot find network');
+      throw new Error((0, _i18next.t)('Cannot find network'));
     }
     const pair = _uiKeyring.keyring.getPair(address);
     if (!pair) {
-      throw Error('Unable to find pair');
+      throw Error((0, _i18next.t)('Unable to find account'));
     }
     if (pair.isLocked) {
       _uiKeyring.keyring.unlockPair(pair.address);
@@ -2377,7 +2438,7 @@ class KoniExtension {
     } else {
       const tx = (0, _eth.createTransactionFromRLP)(message);
       if (!tx) {
-        throw new Error(`Cannot create tx from ${message}`);
+        throw new Error((0, _i18next.t)('Failed to decode data. Please use a valid QR code'));
       }
       const txObject = {
         gasPrice: new _bignumber.default(tx.gasPrice).toNumber(),
@@ -2434,11 +2495,11 @@ class KoniExtension {
     });
     return this.#koniState.getNominatorMetadata();
   }
-  async getBondingOptions(_ref62) {
+  async getBondingOptions(_ref63) {
     let {
       chain,
       type
-    } = _ref62;
+    } = _ref63;
     const apiProps = this.#koniState.getSubstrateApi(chain);
     const chainInfo = this.#koniState.getChainInfo(chain);
     const chainStakingMetadata = await this.#koniState.getStakingMetadataByChain(chain, type);
@@ -2627,12 +2688,12 @@ class KoniExtension {
   }
 
   // EVM Transaction
-  async parseContractInput(_ref63) {
+  async parseContractInput(_ref64) {
     let {
       chainId,
       contract,
       data
-    } = _ref63;
+    } = _ref64;
     const network = this.getNetworkJsonByChainId(chainId);
     return await (0, _parseTransaction2.parseContractInput)(data, contract, network);
   }
@@ -2703,12 +2764,12 @@ class KoniExtension {
 
   // Change master password
 
-  keyringChangeMasterPassword(_ref64) {
+  keyringChangeMasterPassword(_ref65) {
     let {
       createNew,
       newPassword,
       oldPassword
-    } = _ref64;
+    } = _ref65;
     try {
       // Remove isMasterPassword meta if createNew
       if (createNew) {
@@ -2729,11 +2790,14 @@ class KoniExtension {
     } catch (e) {
       console.error(e);
       return {
-        errors: [e.message],
+        errors: [(0, _i18next.t)(e.message)],
         status: false
       };
     }
     this.#koniState.updateKeyringState();
+    if (this.#alwaysLock) {
+      this.keyringLock();
+    }
     return {
       status: true,
       errors: []
@@ -2742,11 +2806,11 @@ class KoniExtension {
 
   // Migrate password
 
-  keyringMigrateMasterPassword(_ref65) {
+  keyringMigrateMasterPassword(_ref66) {
     let {
       address,
       password
-    } = _ref65;
+    } = _ref66;
     try {
       _uiKeyring.keyring.migrateWithMasterPassword(address, password);
     } catch (e) {
@@ -2764,10 +2828,10 @@ class KoniExtension {
 
   // Unlock wallet
 
-  keyringUnlock(_ref66) {
+  keyringUnlock(_ref67) {
     let {
       password
-    } = _ref66;
+    } = _ref67;
     try {
       _uiKeyring.keyring.unlockKeyring(password);
       this.#koniState.initMantaPay(password).catch(console.error);
@@ -2787,18 +2851,17 @@ class KoniExtension {
   // Lock wallet
 
   keyringLock() {
-    _uiKeyring.keyring.lockAll();
-    this.#koniState.updateKeyringState();
+    this.#koniState.keyringService.lock();
     clearTimeout(this.#lockTimeOut);
   }
 
   // Export mnemonic
 
-  keyringExportMnemonic(_ref67) {
+  keyringExportMnemonic(_ref68) {
     let {
       address,
       password
-    } = _ref67;
+    } = _ref68;
     const pair = _uiKeyring.keyring.getPair(address);
     const result = pair.exportMnemonic(password);
     return {
@@ -2808,10 +2871,10 @@ class KoniExtension {
 
   // Reset wallet
 
-  async resetWallet(_ref68) {
+  async resetWallet(_ref69) {
     let {
       resetAll
-    } = _ref68;
+    } = _ref69;
     try {
       await this.#koniState.resetWallet(resetAll);
       return {
@@ -2827,12 +2890,12 @@ class KoniExtension {
   }
 
   /// Signing external request
-  signingApprovePasswordV2(_ref69) {
+  signingApprovePasswordV2(_ref70) {
     let {
       id
-    } = _ref69;
+    } = _ref70;
     const queued = this.#koniState.getSignRequest(id);
-    (0, _util.assert)(queued, 'Unable to find request');
+    (0, _util.assert)(queued, (0, _i18next.t)('Unable to proceed. Please try again'));
     const {
       reject,
       request,
@@ -2847,7 +2910,7 @@ class KoniExtension {
       address
     } = pair;
     if (!pair) {
-      reject(new Error('Unable to find pair'));
+      reject(new Error((0, _i18next.t)('Unable to find account')));
       return false;
     }
     if (pair.isLocked) {
@@ -2887,27 +2950,30 @@ class KoniExtension {
       // In case evm chain, must be cut 2 character after 0x
       signature: isEvm ? `0x${result.signature.slice(4)}` : result.signature
     });
+    if (this.#alwaysLock) {
+      this.keyringLock();
+    }
     return true;
   }
 
   /// Derive account
 
-  derivationCreateMultiple(_ref70) {
+  derivationCreateMultiple(_ref71) {
     let {
       isAllowed,
       items,
       parentAddress
-    } = _ref70;
+    } = _ref71;
     const parentPair = _uiKeyring.keyring.getPair(parentAddress);
     const isEvm = parentPair.type === 'ethereum';
     if (parentPair.isLocked) {
       _uiKeyring.keyring.unlockPair(parentPair.address);
     }
-    const createChild = _ref71 => {
+    const createChild = _ref72 => {
       let {
         name,
         suri
-      } = _ref71;
+      } = _ref72;
       const meta = {
         name: name,
         parentAddress
@@ -2922,7 +2988,7 @@ class KoniExtension {
           }
         } catch (e) {}
         if (!index) {
-          throw Error('Invalid derive path');
+          throw Error((0, _i18next.t)('Invalid derive path'));
         }
         meta.suri = `//${index}`;
         return parentPair.deriveEvm(index, meta);
@@ -2953,10 +3019,10 @@ class KoniExtension {
     }
     return true;
   }
-  derivationCreateV3(_ref72) {
+  derivationCreateV3(_ref73) {
     let {
       address: parentAddress
-    } = _ref72;
+    } = _ref73;
     const parentPair = _uiKeyring.keyring.getPair(parentAddress);
     const isEvm = parentPair.type === 'ethereum';
     if (parentPair.isLocked) {
@@ -2986,13 +3052,16 @@ class KoniExtension {
       _uiKeyring.keyring.addPair(childPair, true);
       this._addAddressToAuthList(address, true);
     });
+    if (this.#alwaysLock) {
+      this.keyringLock();
+    }
     return true;
   }
-  validateDerivePath(_ref73) {
+  validateDerivePath(_ref74) {
     let {
       parentAddress,
       suri
-    } = _ref73;
+    } = _ref74;
     const parentPair = _uiKeyring.keyring.getPair(parentAddress);
     const isEvm = parentPair.type === 'ethereum';
     if (parentPair.isLocked) {
@@ -3012,7 +3081,7 @@ class KoniExtension {
         }
       } catch (e) {}
       if (!index) {
-        throw Error('Invalid derive path');
+        throw Error((0, _i18next.t)('Invalid derive path'));
       }
       meta.suri = `//${index}`;
       childPair = parentPair.deriveEvm(index, meta);
@@ -3025,12 +3094,12 @@ class KoniExtension {
       suri: meta.suri
     };
   }
-  getListDeriveAccounts(_ref74) {
+  getListDeriveAccounts(_ref75) {
     let {
       limit,
       page,
       parentAddress
-    } = _ref74;
+    } = _ref75;
     const parentPair = _uiKeyring.keyring.getPair(parentAddress);
     const isEvm = parentPair.type === 'ethereum';
     if (parentPair.isLocked) {
@@ -3121,10 +3190,10 @@ class KoniExtension {
   getSupportedSmartContractTypes() {
     return this.#koniState.getSupportedSmartContractTypes();
   }
-  getTransaction(_ref75) {
+  getTransaction(_ref76) {
     let {
       id
-    } = _ref75;
+    } = _ref76;
     const {
       transaction,
       ...transactionResult
@@ -3134,8 +3203,8 @@ class KoniExtension {
   subscribeTransactions(id, port) {
     const cb = (0, _subscriptions.createSubscription)(id, port);
     function convertRs(rs) {
-      return Object.fromEntries(Object.entries(rs).map(_ref76 => {
-        let [key, value] = _ref76;
+      return Object.fromEntries(Object.entries(rs).map(_ref77 => {
+        let [key, value] = _ref77;
         const {
           additionalValidator,
           eventsHandler,
@@ -3167,10 +3236,10 @@ class KoniExtension {
     });
     return notificationSubject.value;
   }
-  async reloadCron(_ref77) {
+  async reloadCron(_ref78) {
     let {
       data
-    } = _ref77;
+    } = _ref78;
     if (data === 'nft') {
       return await this.#koniState.reloadNft();
     } else if (data === 'staking') {
@@ -3188,20 +3257,20 @@ class KoniExtension {
 
   // Phishing detect
 
-  async passPhishingPage(_ref78) {
+  async passPhishingPage(_ref79) {
     let {
       url
-    } = _ref78;
+    } = _ref79;
     return await this.#koniState.approvePassPhishingPage(url);
   }
 
   /// Wallet connect
 
   // Connect
-  async connectWalletConnect(_ref79) {
+  async connectWalletConnect(_ref80) {
     let {
       uri
-    } = _ref79;
+    } = _ref80;
     await this.#koniState.walletConnectService.connect(uri);
     return true;
   }
@@ -3214,11 +3283,11 @@ class KoniExtension {
     });
     return this.#koniState.requestService.allConnectWCRequests;
   }
-  async approveWalletConnectSession(_ref80) {
+  async approveWalletConnectSession(_ref81) {
     let {
       accounts: selectedAccounts,
       id
-    } = _ref80;
+    } = _ref81;
     const request = this.#koniState.requestService.getConnectWCRequest(id);
     if ((0, _helpers2.isProposalExpired)(request.request.params)) {
       throw new Error('The proposal has been expired');
@@ -3230,8 +3299,8 @@ class KoniExtension {
     const availableNamespaces = {};
     const namespaces = {};
     const chainInfoMap = this.#koniState.getChainInfoMap();
-    Object.entries(requiredNamespaces).forEach(_ref81 => {
-      let [key, namespace] = _ref81;
+    Object.entries(requiredNamespaces).forEach(_ref82 => {
+      let [key, namespace] = _ref82;
       if ((0, _helpers2.isSupportWalletConnectNamespace)(key)) {
         if (namespace.chains) {
           const unSupportChains = namespace.chains.filter(chain => !(0, _helpers2.isSupportWalletConnectChain)(chain, chainInfoMap));
@@ -3244,8 +3313,8 @@ class KoniExtension {
         throw new Error((0, _utils3.getSdkError)('UNSUPPORTED_NAMESPACE_KEY').message + ' ' + key);
       }
     });
-    Object.entries(optionalNamespaces).forEach(_ref82 => {
-      let [key, namespace] = _ref82;
+    Object.entries(optionalNamespaces).forEach(_ref83 => {
+      let [key, namespace] = _ref83;
       if ((0, _helpers2.isSupportWalletConnectNamespace)(key)) {
         if (namespace.chains) {
           const supportChains = namespace.chains.filter(chain => (0, _helpers2.isSupportWalletConnectChain)(chain, chainInfoMap)) || [];
@@ -3269,8 +3338,8 @@ class KoniExtension {
         }
       }
     });
-    Object.entries(availableNamespaces).forEach(_ref83 => {
-      let [key, namespace] = _ref83;
+    Object.entries(availableNamespaces).forEach(_ref84 => {
+      let [key, namespace] = _ref84;
       if (namespace.chains) {
         const accounts = [];
         const chains = (0, _utils2.uniqueStringArray)(namespace.chains);
@@ -3294,10 +3363,10 @@ class KoniExtension {
     request.resolve();
     return true;
   }
-  async rejectWalletConnectSession(_ref84) {
+  async rejectWalletConnectSession(_ref85) {
     let {
       id
-    } = _ref84;
+    } = _ref85;
     const request = this.#koniState.requestService.getConnectWCRequest(id);
     const wcId = request.request.id;
     if ((0, _helpers2.isProposalExpired)(request.request.params)) {
@@ -3319,10 +3388,10 @@ class KoniExtension {
     });
     return this.#koniState.walletConnectService.sessions;
   }
-  async disconnectWalletConnectSession(_ref85) {
+  async disconnectWalletConnectSession(_ref86) {
     let {
       topic
-    } = _ref85;
+    } = _ref86;
     await this.#koniState.walletConnectService.disconnect(topic);
     return true;
   }
@@ -3335,18 +3404,18 @@ class KoniExtension {
     });
     return this.#koniState.requestService.allNotSupportWCRequests;
   }
-  approveWalletConnectNotSupport(_ref86) {
+  approveWalletConnectNotSupport(_ref87) {
     let {
       id
-    } = _ref86;
+    } = _ref87;
     const request = this.#koniState.requestService.getNotSupportWCRequest(id);
     request.resolve();
     return true;
   }
-  rejectWalletConnectNotSupport(_ref87) {
+  rejectWalletConnectNotSupport(_ref88) {
     let {
       id
-    } = _ref87;
+    } = _ref88;
     const request = this.#koniState.requestService.getNotSupportWCRequest(id);
     request.reject(new Error('USER_REJECTED'));
     return true;
@@ -3354,11 +3423,11 @@ class KoniExtension {
 
   /// Manta
 
-  async enableMantaPay(_ref88) {
+  async enableMantaPay(_ref89) {
     let {
       address,
       password
-    } = _ref88;
+    } = _ref89;
     // always takes the current account
     function timeout() {
       return new Promise(resolve => setTimeout(resolve, 1500));
@@ -3482,10 +3551,10 @@ class KoniExtension {
 
   /// Metadata
 
-  async findRawMetadata(_ref89) {
+  async findRawMetadata(_ref90) {
     let {
       genesisHash
-    } = _ref89;
+    } = _ref90;
     const {
       metadata,
       specVersion
@@ -3508,11 +3577,13 @@ class KoniExtension {
   // eslint-disable-next-line @typescript-eslint/require-await
   async handle(id, type, request, port) {
     clearTimeout(this.#lockTimeOut);
-    this.#lockTimeOut = setTimeout(() => {
-      if (!this.#skipAutoLock) {
-        this.keyringLock();
-      }
-    }, this.#timeAutoLock * 60 * 1000);
+    if (this.#timeAutoLock > 0) {
+      this.#lockTimeOut = setTimeout(() => {
+        if (!this.#skipAutoLock) {
+          this.keyringLock();
+        }
+      }, this.#timeAutoLock * 60 * 1000);
+    }
     switch (type) {
       /// Clone from PolkadotJs
       case 'pri(accounts.create.external)':
@@ -3607,6 +3678,8 @@ class KoniExtension {
         return this.saveBrowserConfirmationType(request);
       case 'pri(settings.saveAutoLockTime)':
         return this.setAutoLockTime(request);
+      case 'pri(settings.saveUnlockType)':
+        return this.setUnlockType(request);
       case 'pri(settings.saveEnableChainPatrol)':
         return this.setEnableChainPatrol(request);
       case 'pri(settings.saveShowZeroBalance)':