Skip to content

Commit 97b9458

Browse files
saltictsaltict
committed
Merge remote-tracking branch 'refs/remotes/origin/webapp-dev' into subwallet-dev
2 parents f39d006 + 0b5a577 commit 97b9458

File tree

6 files changed

+38
-37
lines changed

6 files changed

+38
-37
lines changed

‎packages/extension-base/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,9 @@
6060
"@subwallet/keyring": "^0.1.5",
6161
"@subwallet/ui-keyring": "^0.1.5",
6262
"@walletconnect/keyvaluestorage": "^1.1.1",
63-
"@walletconnect/sign-client": "^2.11.3",
64-
"@walletconnect/types": "^2.11.3",
65-
"@walletconnect/utils": "^2.11.3",
63+
"@walletconnect/sign-client": "^2.13.1",
64+
"@walletconnect/types": "^2.13.1",
65+
"@walletconnect/utils": "^2.13.1",
6666
"avail-js-sdk": "^0.2.12",
6767
"axios": "^1.6.2",
6868
"bignumber.js": "^9.1.1",

‎packages/extension-koni-ui/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
"@subwallet/keyring": "^0.1.5",
4343
"@subwallet/react-ui": "5.1.2-b77",
4444
"@subwallet/ui-keyring": "^0.1.5",
45-
"@walletconnect/types": "^2.11.3",
45+
"@walletconnect/types": "^2.13.1",
4646
"bip39": "^3.1.0",
4747
"boring-avatars": "^1.7.0",
4848
"bowser": "^2.11.0",

‎packages/extension-web-ui/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
"@subwallet/keyring": "^0.1.5",
4444
"@subwallet/react-ui": "^5.1.2-b77",
4545
"@subwallet/ui-keyring": "^0.1.5",
46-
"@walletconnect/types": "^2.11.3",
46+
"@walletconnect/types": "^2.13.1",
4747
"axios": "^1.2.1",
4848
"bip39": "^3.1.0",
4949
"boring-avatars": "^1.7.0",

‎packages/extension-web-ui/src/utils/scanner/walletConnect.ts

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
1-
// Copyright 2019-2022 @subwallet/extension-web-ui authors & contributors
1+
// Copyright 2019-2022 @subwallet/extension-koni-ui authors & contributors
22
// SPDX-License-Identifier: Apache-2.0
33

44
import { parseUri } from '@walletconnect/utils';
55
import { TFunction } from 'i18next';
66

77
export const validWalletConnectUri = (data: string, t: TFunction): string | null => {
88
try {
9-
const { protocol, topic, version } = parseUri(data);
9+
const parameters = parseUri(data);
10+
const { topic, version } = parameters;
1011

1112
if (version === 1) {
1213
return t('Failed to connect. Please use Wallet Connect v2 on dApp');
1314
}
1415

15-
if (protocol !== 'wc' || !topic) {
16+
if (data.startsWith('wc:') && !topic) {
1617
return t('Invalid URI');
1718
}
1819
} catch (e) {

‎packages/webapp/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"author": "Koni Studio",
33
"bugs": "https://github.com/Koniverse/Subwallet-V2/issues",
4-
"buildNumber": "122-0001",
4+
"buildNumber": "122002",
55
"contributors": [],
66
"description": "A web runner simulate background.js can be use on mobile or environment support web view",
77
"homepage": "https://github.com/Koniverse/Subwallet-V2/tree/master/packages/webapp#readme",
@@ -15,7 +15,7 @@
1515
},
1616
"sideEffects": false,
1717
"type": "module",
18-
"version": "1.2.2-0",
18+
"version": "1.2.2",
1919
"dependencies": {
2020
"@babel/runtime": "^7.20.6",
2121
"@subwallet/extension-base": "^1.2.2-0",

‎yarn.lock

+27-27
Original file line numberDiff line numberDiff line change
@@ -6332,9 +6332,9 @@ __metadata:
63326332
"@subwallet/ui-keyring": ^0.1.5
63336333
"@types/uuid": ^9.0.1
63346334
"@walletconnect/keyvaluestorage": ^1.1.1
6335-
"@walletconnect/sign-client": ^2.11.3
6336-
"@walletconnect/types": ^2.11.3
6337-
"@walletconnect/utils": ^2.11.3
6335+
"@walletconnect/sign-client": ^2.13.1
6336+
"@walletconnect/types": ^2.13.1
6337+
"@walletconnect/utils": ^2.13.1
63386338
avail-js-sdk: ^0.2.12
63396339
axios: ^1.6.2
63406340
bignumber.js: ^9.1.1
@@ -6475,7 +6475,7 @@ __metadata:
64756475
"@types/sinon-chrome": ^2.2.11
64766476
"@types/store": ^2.0.2
64776477
"@types/styled-components": ^5.1.26
6478-
"@walletconnect/types": ^2.11.3
6478+
"@walletconnect/types": ^2.13.1
64796479
"@wojtekmaj/enzyme-adapter-react-17": ^0.8.0
64806480
bip39: ^3.1.0
64816481
boring-avatars: ^1.7.0
@@ -6611,7 +6611,7 @@ __metadata:
66116611
"@types/sinon-chrome": ^2.2.11
66126612
"@types/store": ^2.0.2
66136613
"@types/styled-components": ^5.1.26
6614-
"@walletconnect/types": ^2.11.3
6614+
"@walletconnect/types": ^2.13.1
66156615
"@wojtekmaj/enzyme-adapter-react-17": ^0.8.0
66166616
axios: ^1.2.1
66176617
bip39: ^3.1.0
@@ -8305,9 +8305,9 @@ __metadata:
83058305
languageName: node
83068306
linkType: hard
83078307

8308-
"@walletconnect/core@npm:2.13.0":
8309-
version: 2.13.0
8310-
resolution: "@walletconnect/core@npm:2.13.0"
8308+
"@walletconnect/core@npm:2.13.1":
8309+
version: 2.13.1
8310+
resolution: "@walletconnect/core@npm:2.13.1"
83118311
dependencies:
83128312
"@walletconnect/heartbeat": 1.2.2
83138313
"@walletconnect/jsonrpc-provider": 1.0.14
@@ -8320,13 +8320,13 @@ __metadata:
83208320
"@walletconnect/relay-auth": 1.0.4
83218321
"@walletconnect/safe-json": 1.0.2
83228322
"@walletconnect/time": 1.0.2
8323-
"@walletconnect/types": 2.13.0
8324-
"@walletconnect/utils": 2.13.0
8323+
"@walletconnect/types": 2.13.1
8324+
"@walletconnect/utils": 2.13.1
83258325
events: 3.3.0
83268326
isomorphic-unfetch: 3.1.0
83278327
lodash.isequal: 4.5.0
83288328
uint8arrays: 3.1.0
8329-
checksum: 6e503bdc7d678ccaeaa9d93fdc6311298d326febef87f233b80c12340178ae3eff54a3a79e19400d65298f109466c508dbef0d5710fffd09d357b7b6bec8b56f
8329+
checksum: 7690e5a225ed74c7eaa27f52895d1735f06a868429939315a3bdb910d89a55c1e9930070e477a3dc7005d8afc0e7c5a1bbcecf7605fc0f495b4165c49ce1ea8c
83308330
languageName: node
83318331
linkType: hard
83328332

@@ -8472,20 +8472,20 @@ __metadata:
84728472
languageName: node
84738473
linkType: hard
84748474

8475-
"@walletconnect/sign-client@npm:^2.11.3":
8476-
version: 2.13.0
8477-
resolution: "@walletconnect/sign-client@npm:2.13.0"
8475+
"@walletconnect/sign-client@npm:^2.13.1":
8476+
version: 2.13.1
8477+
resolution: "@walletconnect/sign-client@npm:2.13.1"
84788478
dependencies:
8479-
"@walletconnect/core": 2.13.0
8479+
"@walletconnect/core": 2.13.1
84808480
"@walletconnect/events": 1.0.1
84818481
"@walletconnect/heartbeat": 1.2.2
84828482
"@walletconnect/jsonrpc-utils": 1.0.8
84838483
"@walletconnect/logger": 2.1.2
84848484
"@walletconnect/time": 1.0.2
8485-
"@walletconnect/types": 2.13.0
8486-
"@walletconnect/utils": 2.13.0
8485+
"@walletconnect/types": 2.13.1
8486+
"@walletconnect/utils": 2.13.1
84878487
events: 3.3.0
8488-
checksum: d8516d5bc7f554962651d59af36c13716da35216e78a92b4ab2632d6c2e65dccc9fda83e5ef8ceaab3195c2436cdd038ff7ed1176b25c57142f823735a5f987c
8488+
checksum: 5f0f728c8ba7f2d4134470ffa4bdcc206ad65a33a7e33dea95c324e924eefffb34b2bee57d5048e190977c7c28d6c219581d17e5f3e72b72d59d1b171e0faa7c
84898489
languageName: node
84908490
linkType: hard
84918491

@@ -8498,23 +8498,23 @@ __metadata:
84988498
languageName: node
84998499
linkType: hard
85008500

8501-
"@walletconnect/types@npm:2.13.0, @walletconnect/types@npm:^2.11.3":
8502-
version: 2.13.0
8503-
resolution: "@walletconnect/types@npm:2.13.0"
8501+
"@walletconnect/types@npm:2.13.1, @walletconnect/types@npm:^2.13.1":
8502+
version: 2.13.1
8503+
resolution: "@walletconnect/types@npm:2.13.1"
85048504
dependencies:
85058505
"@walletconnect/events": 1.0.1
85068506
"@walletconnect/heartbeat": 1.2.2
85078507
"@walletconnect/jsonrpc-types": 1.0.4
85088508
"@walletconnect/keyvaluestorage": 1.1.1
85098509
"@walletconnect/logger": 2.1.2
85108510
events: 3.3.0
8511-
checksum: 868e12449026154c5a8945359ab03c2f2dd7dd329e631fea721e8399928823b93585013784253d787daf184adb76de6bccd76525679b4c87fd830300c70275d4
8511+
checksum: 5a028bf2d1c250ffadf6a5b898553bd6f63d4eb944d73bd43a633b2d12854c4908cf966fd18c21275490e93d91f39cbd6b5461b0fc38c8eafb5b9554b1203aeb
85128512
languageName: node
85138513
linkType: hard
85148514

8515-
"@walletconnect/utils@npm:2.13.0, @walletconnect/utils@npm:^2.11.3":
8516-
version: 2.13.0
8517-
resolution: "@walletconnect/utils@npm:2.13.0"
8515+
"@walletconnect/utils@npm:2.13.1, @walletconnect/utils@npm:^2.13.1":
8516+
version: 2.13.1
8517+
resolution: "@walletconnect/utils@npm:2.13.1"
85188518
dependencies:
85198519
"@stablelib/chacha20poly1305": 1.0.1
85208520
"@stablelib/hkdf": 1.0.1
@@ -8524,13 +8524,13 @@ __metadata:
85248524
"@walletconnect/relay-api": 1.0.10
85258525
"@walletconnect/safe-json": 1.0.2
85268526
"@walletconnect/time": 1.0.2
8527-
"@walletconnect/types": 2.13.0
8527+
"@walletconnect/types": 2.13.1
85288528
"@walletconnect/window-getters": 1.0.1
85298529
"@walletconnect/window-metadata": 1.0.1
85308530
detect-browser: 5.3.0
85318531
query-string: 7.1.3
85328532
uint8arrays: 3.1.0
8533-
checksum: ab3c008aa72e573d67f342042e62c04e4aa779bde94f850de53f7bda31a4458665b39af2e33ae6ee6f237aa19f55cef542c75cabbe647218c02075700d2c713f
8533+
checksum: 0112da2d2dc348023934d3fcd7c67d476b7b5c444e3809fd6086923cbcabfacc3e1a3165ca49979da7aa658d9358340a278bee448a6df4f6a58ba7c4f3e47ea3
85348534
languageName: node
85358535
linkType: hard
85368536

0 commit comments

Comments
 (0)