Merge branch 'koni/dev/issue-2536' into webapp-demo

.123trigger

@@ -104,4 +104,5 @@
 1.1.34
 1.1.35
 1.1.36
-1.1.37
+1.1.37
+1.1.38

.eslintrc.js

@@ -9,7 +9,7 @@ module.exports = {
     ...base.ignorePatterns,
     "i18next-scanner.config.js",
     "koni-*.mjs",
-    "test.ts"
+    "*.spec.ts"
   ],
   parserOptions: {
     ...base.parserOptions,

CHANGELOG.md

@@ -1,5 +1,19 @@
 # CHANGELOG
 
+## 1.1.38
+Build date: Feb 17, 2024.
+
+Features & Update:
+- Update estimating EVM transaction fee for Energy Web Chain (#2606)
+- Update chain-list (#2570)
+  - Add support more tokens: PINK (Statemint), xcPINK (Moonbeam), INTR (HydraDX)
+  - Update explorer for Subspace Gemini 3g & 3h
+  - Update price_id for Energy Web X
+  - Update hasValue info for some tokens
+
+Bugs fixed:
+- Fixed some UI bug (#2509)
+
 ## 1.1.37
 Build date: Feb 07, 2024.
 

CONTRIBUTORS

@@ -1,6 +1,6 @@
-    2253	AnhMTV                        	Release version 1.1.37
+    2257	AnhMTV                        	Release version 1.1.38
     2165	Nam Phạm                      	[Issue 2558] fix bug showing slug instead of network name
-    1904	S2kael                        	[Issue-2569] Fix crash on Earning screen
+    1910	S2kael                        	[Issue-2570] Update chain list
      609	lw-cdm                        	[Issue-2598] Update UI for earning screens
      465	Jaco                          	0.42.5 (#969)
      185	quangdo                       	
@@ -12,8 +12,8 @@
       80	leewong                       	Update account filter for earn transaction
       63	Roman                         	fix ui issues
       53	Dominhquangdev                	update Bridge code
-      47	nguyentiendung                	Update modal for Earning
-      39	bluedot                       	temporary prevent send nfts on Unique network-based chains
+      48	nguyentiendung                	Update modal for Earning
+      44	bluedot                       	update priceId for EWT on Energy Web X
       29	Automation Bot                	[CI Skip] Auto increase webapp build number
       27	Thiendekaco                   	update locate of file
       24	S2kael                        	

jest.config.cjs

@@ -1,10 +1,11 @@
 // Copyright 2019-2022 @subwallet/extension authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-const config = require('@polkadot/dev/config/jest.cjs');
+const {extraGlobals, ...config} = require('@polkadot/dev/config/jest.cjs');
 
 module.exports = {
   ...config,
+  sandboxInjectedGlobals: config['extraGlobals'],
   modulePathIgnorePatterns: [
     ...config.modulePathIgnorePatterns
   ],

package.json

@@ -10,7 +10,7 @@
     "url": "https://github.com/Koniverse/Subwallet-V2.git"
   },
   "sideEffects": false,
-  "version": "1.1.37",
+  "version": "1.1.38",
   "workspaces": [
     "packages/*"
   ],
@@ -83,13 +83,13 @@
     "@google/model-viewer": "3.1.1",
     "@ledgerhq/hw-app-eth": "6.33.4",
     "@polkadot/api": "^10.9.1",
-    "@polkadot/api-base": "^10.9.1",
-    "@polkadot/api-contract": "^10.9.1",
-    "@polkadot/networks": "^12.3.2",
-    "@polkadot/types": "^10.9.1",
-    "@polkadot/util": "^12.3.2",
-    "@polkadot/util-crypto": "^12.3.2",
-    "@subwallet/chain-list": "0.2.40",
+    "@polkadot/api-base": "^10.11.2",
+    "@polkadot/api-contract": "^10.11.2",
+    "@polkadot/networks": "^12.6.2",
+    "@polkadot/types": "^10.11.2",
+    "@polkadot/util": "^12.6.2",
+    "@polkadot/util-crypto": "^12.6.2",
+    "@subwallet/chain-list": "0.2.41",
     "@subwallet/keyring": "^0.1.3",
     "@subwallet/ui-keyring": "^0.1.3",
     "babel-core": "^7.0.0-bridge.0",

packages/extension-base/package.json

@@ -17,7 +17,7 @@
     "./detectPackage.cjs"
   ],
   "type": "module",
-  "version": "1.1.37-0",
+  "version": "1.1.38-1",
   "main": "index.js",
   "dependencies": {
     "@acala-network/api": "^5.0.2",
@@ -31,28 +31,28 @@
     "@metamask/safe-event-emitter": "^2.0.0",
     "@metaverse-network-sdk/type-definitions": "^0.0.1-13",
     "@oak-foundation/types": "^0.0.23",
-    "@polkadot/api": "^10.11.1",
+    "@polkadot/api": "^10.11.2",
     "@polkadot/api-base": "^10.9.1",
-    "@polkadot/api-contract": "^10.11.1",
-    "@polkadot/api-derive": "^10.11.1",
+    "@polkadot/api-contract": "^10.11.2",
+    "@polkadot/api-derive": "^10.11.2",
     "@polkadot/apps-config": "^0.133.1",
-    "@polkadot/hw-ledger": "^12.6.1",
-    "@polkadot/networks": "^12.6.1",
+    "@polkadot/hw-ledger": "^12.6.2",
+    "@polkadot/networks": "^12.6.2",
     "@polkadot/phishing": "^0.22.1",
-    "@polkadot/rpc-provider": "^10.11.1",
-    "@polkadot/types": "^10.11.1",
-    "@polkadot/types-augment": "^10.11.1",
+    "@polkadot/rpc-provider": "^10.11.2",
+    "@polkadot/types": "^10.11.2",
+    "@polkadot/types-augment": "^10.11.2",
     "@polkadot/ui-settings": "^3.6.4",
-    "@polkadot/util": "^12.6.1",
-    "@polkadot/util-crypto": "^12.6.1",
+    "@polkadot/util": "^12.6.2",
+    "@polkadot/util-crypto": "^12.6.2",
     "@reduxjs/toolkit": "^1.9.1",
     "@sora-substrate/type-definitions": "^1.17.7",
     "@substrate/connect": "^0.7.26",
-    "@subwallet/chain-list": "0.2.40",
-    "@subwallet/extension-base": "^1.1.37-0",
-    "@subwallet/extension-chains": "^1.1.37-0",
-    "@subwallet/extension-dapp": "^1.1.37-0",
-    "@subwallet/extension-inject": "^1.1.37-0",
+    "@subwallet/chain-list": "0.2.41",
+    "@subwallet/extension-base": "^1.1.38-1",
+    "@subwallet/extension-chains": "^1.1.38-1",
+    "@subwallet/extension-dapp": "^1.1.38-1",
+    "@subwallet/extension-inject": "^1.1.38-1",
     "@subwallet/keyring": "^0.1.3",
     "@subwallet/ui-keyring": "^0.1.3",
     "@walletconnect/sign-client": "^2.8.4",
@@ -90,7 +90,7 @@
     "web3-utils": "^1.10.0"
   },
   "devDependencies": {
-    "@subwallet/extension-mocks": "^1.1.37-0",
+    "@subwallet/extension-mocks": "^1.1.38-1",
     "@types/uuid": "^9.0.1"
   }
 }

packages/extension-base/src/koni/background/handlers/Extension.ts

@@ -3107,7 +3107,7 @@ export default class KoniExtension {
         const isChainActive = this.#koniState.getChainStateByKey(chainInfo.slug).active;
 
         if (!isChainActive) {
-          reject(new Error('Please active chain {{chain}} before sign'.replaceAll('{{chain}}', chainInfo.name)));
+          reject(new Error('Please activate {{chain}} network before signing'.replaceAll('{{chain}}', chainInfo.name)));
 
           return false;
         } else {

packages/extension-base/src/packageInfo.ts

@@ -3,4 +3,4 @@
 
 // Do not edit, auto-generated by @polkadot/dev
 
-export const packageInfo = { name: '@subwallet/extension-base', path: 'auto', type: 'auto', version: '1.1.37-0' };
+export const packageInfo = { name: '@subwallet/extension-base', path: 'auto', type: 'auto', version: '1.1.38-1' };

packages/extension-base/src/services/balance-service/helpers/subscribe/balance.ts

@@ -48,7 +48,7 @@ const filterAddress = (addresses: string[], chainInfo: _ChainInfo): [string[], s
   const [substrateAddresses, evmAddresses] = categoryAddresses(addresses);
 
   if (isEvmChain) {
-    return [evmAddresses, []];
+    return [evmAddresses, substrateAddresses];
   } else {
     const fetchList: string[] = [];
     const unfetchList: string[] = [];