Skip to content

Commit 0efe870

Browse files
saltictsaltict
committed
Merge branch 'refs/heads/subwallet-dev' into webapp-dev
# Conflicts: # packages/webapp/package.json
2 parents 531224f + 6c80766 commit 0efe870

File tree

204 files changed

+3096
-3260
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

204 files changed

+3096
-3260
lines changed

‎.123trigger

+2-1
Original file line numberDiff line numberDiff line change
@@ -135,4 +135,5 @@
135135
1.1.65
136136
1.1.66
137137
1.1.67
138-
1.1.68
138+
1.1.68
139+
1.2.2

‎.github/workflows/push-koni-dev.yml

+2
Original file line numberDiff line numberDiff line change
@@ -73,3 +73,5 @@ jobs:
7373
description: |
7474
The Deployment has been completed.
7575
- Extension: ${{ steps.nextcloud_upload.outputs.SHAREABLE_URL }}
76+
- Extension (Firefox): ${{ steps.nextcloud_upload_firefox.outputs.SHAREABLE_URL }}
77+
- Web-runner: ${{ steps.netlify_deployment.outputs.deploy-url }}

‎.github/workflows/push-master.yml

+3-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
yarn install --immutable | grep -v 'YN0013'
3030
yarn ${{ matrix.step }}
3131
32-
- name: Upload to Build to Nextcloud
32+
- name: Upload Build to Nextcloud
3333
id: nextcloud_upload
3434
uses: trympet/nextcloud-artifacts-action@v2
3535
with:
@@ -50,3 +50,5 @@ jobs:
5050
description: |
5151
Master is completed.
5252
- Extension: ${{ steps.nextcloud_upload.outputs.SHAREABLE_URL }}
53+
- Extension (Firefox): ${{ steps.nextcloud_upload_firefox.outputs.SHAREABLE_URL }}
54+
- Web-runner: ${{ steps.netlify_deployment.outputs.deploy-url }}

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ tmp/
1616
.pnp.*
1717
cc-test-reporter
1818
lerna-debug.log*
19+
master-build-firefox.zip
1920
master-build.zip
2021
master-src.zip
2122
npm-debug.log*

‎CHANGELOG.md

+21
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,26 @@
11
# CHANGELOG
22

3+
## 1.2.2
4+
Build date: May 30, 2024.
5+
6+
Features & Update:
7+
- Remove support for Moonbeam on Polkadot vault (#3056)
8+
- Update UI for Earning position details (#3127)
9+
- Remove the logic that differentiates between Native tokens and Local tokens in case show sub-logo (#3075)
10+
- Show duplicate transaction history when transfer local token (#2613)
11+
12+
Bugs fixed:
13+
- Fixed some bug related to MV3 (#3146)
14+
- Timing logic to display seed phrase backup prompt popup
15+
- Bug disconnect port
16+
17+
## 1.2.1
18+
Build date: May 28, 2024.
19+
20+
Features & Update:
21+
- Update Extension Manifest V3 (#2205)
22+
- Handle case displayed account with specific network (#2709)
23+
324
## 1.1.68
425
Build date: May 25, 2024.
526

‎CONTRIBUTORS

+7-6
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
2540 AnhMTV Release version 1.1.68
2-
2354 Nam Phạm [Issue 3101] fix: bug missing custom tokens on applying patch
3-
2048 S2kael [Issue-3115] Update stable version for chain-list
1+
2643 AnhMTV Release version 1.2.2
2+
2355 Nam Phạm [Issue 3129] fix: force apply patch
3+
2060 S2kael [Issue-3121] Fix HTTP provider error when subscribe tx status
44
815 lw-cdm Fix eslint issues
55
465 Jaco 0.42.5 (#969)
6-
416 nguyentiendung [Issue-2914] Update yarn.lock
6+
425 nguyentiendung
77
185 quangdo
88
150 bluezdot [Issue-3088] Update logo earning option
9-
106 Automation Bot [CI Skip] Auto increase webapp build number
9+
129 Thiendekaco [Issue 3117] [fix] [mv3] Extension - Still show icon ZK mode on Export account screen in case upgrade version MV2 -> MV3
10+
108 Automation Bot [CI Skip] Auto increase webapp build number
1011
106 dominhquang [Issue-2649] Add send crash log feature
1112
104 khainh predefine metadata for Polkadot & Kusama chains
1213
101 lw-cdm
13-
99 Thiendekaco [Issue 3090] [fix] Extension - Recheck fetch static data
1414
83 Hieu Dao Update README.md
1515
82 Thibaut Sardan Add account filtering feature (#832)
1616
81 leewong Swap - Change idle time to 300s
@@ -38,6 +38,7 @@
3838
2 Shawn Tabrizi Add configurable notifications (#767)
3939
2 WoeOm add darwinia network (#493)
4040
2 Yash Mittal Address comment
41+
1 0_0./
4142
1 Aleksandr Ishchenko [#897] signer.signRaw signing doesn't work with Ledger Nano X (#905)
4243
1 Amit Chauhan Fixed toast flicker effect when multiple show toast method called
4344
1 Andrei Eres Add extension prefix (#891)

‎package.json

+4-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"url": "https://github.com/Koniverse/Subwallet-V2.git"
1111
},
1212
"sideEffects": false,
13-
"version": "1.1.68",
13+
"version": "1.2.2",
1414
"workspaces": [
1515
"packages/*"
1616
],
@@ -19,6 +19,7 @@
1919
"koni-ci-build-i18n": "./scripts/koni-ci-build-i18n.mjs",
2020
"koni-ci-build-webapp": "./scripts/koni-ci-build-webapp.mjs",
2121
"koni-ci-ghact-build": "./scripts/koni-ci-ghact-build.mjs",
22+
"koni-ci-mv3-firefox": "./scripts/koni-ci-mv3-firefox.mjs",
2223
"koni-ci-webapp-update-build-number": "./scripts/koni-ci-webapp-update-build-number.mjs",
2324
"koni-dev-build-ts": "./scripts/koni-dev-build-ts.mjs"
2425
},
@@ -31,8 +32,9 @@
3132
"build:release": "koni-ci-ghact-build",
3233
"build:rollup": "polkadot-exec-rollup --config",
3334
"build:ui": "cd packages/extension-koni && NODE_ENV=production yarn webpack --config webpack.extension.cjs --mode production",
34-
"build:zip": "yarn build:zip:dst && yarn build:zip:src",
35+
"build:zip": "yarn build:zip:dst && yarn build:zip:src && yarn build:zip:ff",
3536
"build:zip:dst": "rm -rf ./master-build.zip && cd packages/extension-koni/build && zip -r -FS ../../../master-build.zip .",
37+
"build:zip:ff": "koni-ci-mv3-firefox && rm -rf ./master-build-firefox.zip && cd packages/extension-koni/build && zip -r -FS ../../../master-build-firefox.zip .",
3638
"build:zip:src": "rm -rf ./master-src.zip && zip -r -x '*build/*' -x '*node_modules*' -FS ./master-src.zip packages .editorconfig .eslintignore .eslintrc.js babel.config.cjs CHANGELOG.md CONTRIBUTING.md i18next-scanner.config.js jest.config.cjs LICENSE package.json README.md tsconfig.json yarn.lock",
3739
"clean": "polkadot-dev-clean-build",
3840
"dev": "yarn watch-dev",

‎packages/extension-base/package.json

+11-9
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"./detectPackage.cjs"
1818
],
1919
"type": "module",
20-
"version": "1.1.68-2",
20+
"version": "1.2.2-0",
2121
"main": "index.js",
2222
"dependencies": {
2323
"@acala-network/api": "^5.0.2",
@@ -48,19 +48,21 @@
4848
"@polkadot/ui-settings": "^3.6.6",
4949
"@polkadot/util": "^12.6.2",
5050
"@polkadot/util-crypto": "^12.6.2",
51+
"@polkadot/x-global": "^12.2.1",
5152
"@reduxjs/toolkit": "^1.9.1",
5253
"@sora-substrate/type-definitions": "^1.17.7",
5354
"@substrate/connect": "^0.8.9",
5455
"@subwallet/chain-list": "0.2.65",
55-
"@subwallet/extension-base": "^1.1.68-2",
56-
"@subwallet/extension-chains": "^1.1.68-2",
57-
"@subwallet/extension-dapp": "^1.1.68-2",
58-
"@subwallet/extension-inject": "^1.1.68-2",
56+
"@subwallet/extension-base": "^1.2.2-0",
57+
"@subwallet/extension-chains": "^1.2.2-0",
58+
"@subwallet/extension-dapp": "^1.2.2-0",
59+
"@subwallet/extension-inject": "^1.2.2-0",
5960
"@subwallet/keyring": "^0.1.5",
6061
"@subwallet/ui-keyring": "^0.1.5",
61-
"@walletconnect/sign-client": "^2.8.4",
62-
"@walletconnect/types": "^2.8.4",
63-
"@walletconnect/utils": "^2.8.4",
62+
"@walletconnect/keyvaluestorage": "^1.1.1",
63+
"@walletconnect/sign-client": "^2.11.3",
64+
"@walletconnect/types": "^2.11.3",
65+
"@walletconnect/utils": "^2.11.3",
6466
"avail-js-sdk": "^0.2.12",
6567
"axios": "^1.6.2",
6668
"bignumber.js": "^9.1.1",
@@ -94,7 +96,7 @@
9496
"web3-utils": "^1.10.0"
9597
},
9698
"devDependencies": {
97-
"@subwallet/extension-mocks": "^1.1.68-2",
99+
"@subwallet/extension-mocks": "^1.2.2-0",
98100
"@types/uuid": "^9.0.1"
99101
}
100102
}

‎packages/extension-base/src/background/KoniTypes.ts

+3-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import { _ChainState, _EvmApi, _NetworkUpsertParams, _SubstrateApi, _ValidateCus
1010
import { CrowdloanContributionsResponse } from '@subwallet/extension-base/services/subscan-service/types';
1111
import { SWTransactionResponse, SWTransactionResult } from '@subwallet/extension-base/services/transaction-service/types';
1212
import { WalletConnectNotSupportRequest, WalletConnectSessionRequest } from '@subwallet/extension-base/services/wallet-connect-service/types';
13-
import { BalanceJson, BuyServiceInfo, BuyTokenInfo, EarningRewardHistoryItem, EarningRewardJson, EarningStatus, HandleYieldStepParams, LeavePoolAdditionalData, NominationPoolInfo, OptimalYieldPath, OptimalYieldPathParams, RequestEarlyValidateYield, RequestGetYieldPoolTargets, RequestStakeCancelWithdrawal, RequestStakeClaimReward, RequestUnlockDotCheckCanMint, RequestUnlockDotSubscribeMintedData, RequestYieldLeave, RequestYieldStepSubmit, RequestYieldWithdrawal, ResponseEarlyValidateYield, ResponseGetYieldPoolTargets, SubmitYieldStepData, TokenApproveData, UnlockDotTransactionNft, UnstakingStatus, ValidateYieldProcessParams, YieldPoolInfo, YieldPositionInfo, YieldValidationStatus } from '@subwallet/extension-base/types';
13+
import { BalanceJson, BuyServiceInfo, BuyTokenInfo, EarningRewardHistoryItem, EarningRewardJson, EarningStatus, HandleYieldStepParams, LeavePoolAdditionalData, NominationPoolInfo, OptimalYieldPath, OptimalYieldPathParams, RequestEarlyValidateYield, RequestGetYieldPoolTargets, RequestStakeCancelWithdrawal, RequestStakeClaimReward, RequestUnlockDotCheckCanMint, RequestUnlockDotSubscribeMintedData, RequestYieldLeave, RequestYieldStepSubmit, RequestYieldWithdrawal, ResponseEarlyValidateYield, ResponseGetYieldPoolTargets, StorageDataInterface, SubmitYieldStepData, TokenApproveData, UnlockDotTransactionNft, UnstakingStatus, ValidateYieldProcessParams, YieldPoolInfo, YieldPositionInfo, YieldValidationStatus } from '@subwallet/extension-base/types';
1414
import { SwapErrorType, SwapPair, SwapQuoteResponse, SwapRequest, SwapRequestResult, SwapSubmitParams, SwapTxData, ValidateSwapProcessParams } from '@subwallet/extension-base/types/swap';
1515
import { InjectedAccount, InjectedAccountWithMeta, MetadataDefBase } from '@subwallet/extension-inject/types';
1616
import { KeyringPair$Json, KeyringPair$Meta } from '@subwallet/keyring/types';
@@ -2570,6 +2570,8 @@ export interface KoniRequestSignatures {
25702570
'pri(database.export)': [null, string];
25712571
'pri(database.import)': [string, boolean];
25722572
'pri(database.exportJson)': [null, DexieExportJsonStructure];
2573+
'pri(database.migrateLocalStorage)': [string, boolean];
2574+
'pri(database.setLocalStorage)': [StorageDataInterface, boolean];
25732575
/* Database Service */
25742576

25752577
/* Swap */

0 commit comments

Comments
 (0)