Merge pull request #3754 from Koniverse/koni/dev/master-account

Unified account

.123trigger

@@ -165,4 +165,5 @@
 1.2.28
 1.2.29
 1.2.30
-1.2.31
+1.2.31
+1.2.32

.eslintrc.js

@@ -9,7 +9,8 @@ module.exports = {
     ...base.ignorePatterns,
     "i18next-scanner.config.js",
     "koni-*.mjs",
-    "*.spec.ts"
+    "packages/extension-web-ui/**/*", // Remove after migration to web-ui
+    // "*.spec.ts"
   ],
   parserOptions: {
     ...base.parserOptions,

CHANGELOG.md

@@ -1,5 +1,14 @@
 # CHANGELOG
 
+## 1.2.32
+Build date: Oct 01, 2024.
+
+Features & Update:
+- Improve marketing campaign (#3461, #2807)
+
+Bugs fixed:
+- Hot fix handle API status (#3711)
+
 ## 1.2.31
 Build date: Sep 28, 2024.
 

CONTRIBUTORS

@@ -1,14 +1,14 @@
-    2838	AnhMTV                        	Release version 1.2.31
+    2842	AnhMTV                        	Release version 1.2.32
     2541	Nam Phạm                      	[Issue 3680] chore: update chainlist
-    2190	S2kael                        	[Issue-3680] Update stable version for chain-list
+    2192	S2kael                        	[Issue-3711] Rollback handle pending state for balance item
      848	lw-cdm                        	[Issue-3407] WebApp - Support Avail Ledger app
      565	nguyentiendung                	[Issue-2845] Fix UI bugs export accounts
      465	Jaco                          	0.42.5 (#969)
      327	bluezdot                      	[Issue-3635] feat: update content
      241	Thiendekaco                   	
      185	quangdo                       	
      160	Automation Bot                	[CI Skip] Auto increase webapp build number
-     146	dominhquang                   	[Issue-3468] Improve condition for Marketing campaign
+     157	dominhquang                   	
      118	lw-cdm                        	
      104	khainh                        	predefine metadata for Polkadot & Kusama chains
       83	Hieu Dao                      	Update README.md

jest.config.cjs

@@ -15,6 +15,6 @@ module.exports = {
     '@subwallet/extension-koni(.*)$': '<rootDir>/packages/extension-koni/src/$1',
     '\\.(css|less)$': 'empty/object',
     '\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$': '<rootDir>/packages/extension-mocks/src/fileMock.js'
-  },
-  testEnvironment: 'jsdom'
+  }
+  // testEnvironment: 'jsdom'
 };

package.json

@@ -10,7 +10,7 @@
     "url": "https://github.com/Koniverse/Subwallet-V2.git"
   },
   "sideEffects": false,
-  "version": "1.2.31",
+  "version": "1.2.32",
   "workspaces": [
     "packages/*"
   ],
@@ -85,6 +85,7 @@
   },
   "resolutions": {
     "@ethereumjs/common": "^4.1.0",
+    "@ethereumjs/tx": "^5.1.0",
     "@google/model-viewer": "3.1.1",
     "@ledgerhq/hw-app-eth": "6.33.4",
     "@ledgerhq/hw-transport": "6.30.3",
@@ -105,9 +106,9 @@
     "@polkadot/util": "^12.6.2",
     "@polkadot/util-crypto": "^12.6.2",
     "@subwallet/chain-list": "0.2.88",
-    "@subwallet/keyring": "^0.1.7",
+    "@subwallet/keyring": "^0.1.8-beta.0",
     "@subwallet/react-ui": "5.1.2-b79",
-    "@subwallet/ui-keyring": "^0.1.7",
+    "@subwallet/ui-keyring": "0.1.8-beta.0 ",
     "@zondax/ledger-substrate": "0.44.2",
     "babel-core": "^7.0.0-bridge.0",
     "babel-jest": "^29.3.1",

packages/extension-base/package.json

@@ -17,7 +17,7 @@
     "./detectPackage.cjs"
   ],
   "type": "module",
-  "version": "1.2.31-0",
+  "version": "1.2.32-0",
   "main": "index.js",
   "dependencies": {
     "@acala-network/api": "^5.0.2",
@@ -56,12 +56,15 @@
     "@sora-substrate/type-definitions": "^1.17.7",
     "@substrate/connect": "^0.8.9",
     "@subwallet/chain-list": "0.2.88",
-    "@subwallet/extension-base": "^1.2.31-0",
-    "@subwallet/extension-chains": "^1.2.31-0",
-    "@subwallet/extension-dapp": "^1.2.31-0",
-    "@subwallet/extension-inject": "^1.2.31-0",
-    "@subwallet/keyring": "^0.1.7",
-    "@subwallet/ui-keyring": "^0.1.7",
+    "@subwallet/extension-base": "^1.2.32-0",
+    "@subwallet/extension-chains": "^1.2.32-0",
+    "@subwallet/extension-dapp": "^1.2.32-0",
+    "@subwallet/extension-inject": "^1.2.32-0",
+    "@subwallet/keyring": "^0.1.8-beta.0",
+    "@subwallet/ui-keyring": "^0.1.8-beta.0",
+    "@ton/core": "^0.56.3",
+    "@ton/crypto": "^3.2.0",
+    "@ton/ton": "^15.0.0",
     "@walletconnect/keyvaluestorage": "^1.1.1",
     "@walletconnect/sign-client": "^2.14.0",
     "@walletconnect/types": "^2.14.0",
@@ -90,6 +93,7 @@
     "protobufjs": "^7.2.4",
     "rxjs": "^7.8.1",
     "sails-js": "^0.1.6",
+    "tweetnacl": "^1.0.3",
     "uuid": "^9.0.0",
     "web3": "^1.10.0",
     "web3-core": "^1.10.0",
@@ -100,7 +104,7 @@
     "web3-utils": "^1.10.0"
   },
   "devDependencies": {
-    "@subwallet/extension-mocks": "^1.2.31-0",
+    "@subwallet/extension-mocks": "^1.2.32-0",
     "@types/uuid": "^9.0.1"
   }
 }