Skip to content

Commit 3f2601d

Browse files
wabicaiwabicai
authored
fix: fix skipwebdeviceprompt in web (#620)
1 parent 5046745 commit 3f2601d

File tree

17 files changed

+62
-56
lines changed

17 files changed

+62
-56
lines changed

‎packages/connect-examples/electron-example/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "hardware-example",
33
"productName": "HardwareExample",
44
"executableName": "onekey-hardware-example",
5-
"version": "1.1.19-alpha.7",
5+
"version": "1.1.19-alpha.8",
66
"author": "OneKey",
77
"description": "End-to-end encrypted workspaces for teams",
88
"main": "dist/index.js",
@@ -22,7 +22,7 @@
2222
"ts:check": "yarn tsc --noEmit"
2323
},
2424
"dependencies": {
25-
"@onekeyfe/hd-transport-electron": "1.1.19-alpha.7",
25+
"@onekeyfe/hd-transport-electron": "1.1.19-alpha.8",
2626
"@stoprocent/noble": "2.3.4",
2727
"debug": "4.3.4",
2828
"electron-is-dev": "^3.0.1",

‎packages/connect-examples/expo-example/package.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "expo-example",
3-
"version": "1.1.19-alpha.7",
3+
"version": "1.1.19-alpha.8",
44
"scripts": {
55
"start": "cross-env CONNECT_SRC=https://localhost:8087/ yarn expo start --dev-client",
66
"android": "yarn expo run:android",
@@ -19,10 +19,10 @@
1919
"@noble/ed25519": "^2.1.0",
2020
"@noble/hashes": "^1.3.3",
2121
"@noble/secp256k1": "^1.7.1",
22-
"@onekeyfe/hd-ble-sdk": "1.1.19-alpha.7",
23-
"@onekeyfe/hd-common-connect-sdk": "1.1.19-alpha.7",
24-
"@onekeyfe/hd-core": "1.1.19-alpha.7",
25-
"@onekeyfe/hd-web-sdk": "1.1.19-alpha.7",
22+
"@onekeyfe/hd-ble-sdk": "1.1.19-alpha.8",
23+
"@onekeyfe/hd-common-connect-sdk": "1.1.19-alpha.8",
24+
"@onekeyfe/hd-core": "1.1.19-alpha.8",
25+
"@onekeyfe/hd-web-sdk": "1.1.19-alpha.8",
2626
"@onekeyfe/react-native-ble-utils": "^0.1.3",
2727
"@polkadot/util-crypto": "13.1.1",
2828
"@react-native-async-storage/async-storage": "1.21.0",

‎packages/connect-examples/expo-playground/package.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "onekey-hardware-playground",
3-
"version": "1.1.19-alpha.7",
3+
"version": "1.1.19-alpha.8",
44
"private": true,
55
"sideEffects": [
66
"app/utils/shim.js",
@@ -17,9 +17,9 @@
1717
},
1818
"dependencies": {
1919
"@noble/hashes": "^1.8.0",
20-
"@onekeyfe/hd-common-connect-sdk": "1.1.19-alpha.7",
21-
"@onekeyfe/hd-core": "1.1.19-alpha.7",
22-
"@onekeyfe/hd-shared": "1.1.19-alpha.7",
20+
"@onekeyfe/hd-common-connect-sdk": "1.1.19-alpha.8",
21+
"@onekeyfe/hd-core": "1.1.19-alpha.8",
22+
"@onekeyfe/hd-shared": "1.1.19-alpha.8",
2323
"@radix-ui/react-checkbox": "^1.3.2",
2424
"@radix-ui/react-dialog": "^1.1.14",
2525
"@radix-ui/react-dropdown-menu": "^2.1.15",

‎packages/core/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@onekeyfe/hd-core",
3-
"version": "1.1.19-alpha.7",
3+
"version": "1.1.19-alpha.8",
44
"description": "Core processes and APIs for communicating with OneKey hardware devices.",
55
"author": "OneKey",
66
"homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
@@ -25,8 +25,8 @@
2525
"url": "https://github.com/OneKeyHQ/hardware-js-sdk/issues"
2626
},
2727
"dependencies": {
28-
"@onekeyfe/hd-shared": "1.1.19-alpha.7",
29-
"@onekeyfe/hd-transport": "1.1.19-alpha.7",
28+
"@onekeyfe/hd-shared": "1.1.19-alpha.8",
29+
"@onekeyfe/hd-transport": "1.1.19-alpha.8",
3030
"axios": "1.12.2",
3131
"bignumber.js": "^9.0.2",
3232
"bytebuffer": "^5.0.1",

‎packages/core/src/api/FirmwareUpdateV2.ts‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,8 +147,11 @@ export default class FirmwareUpdateV2 extends BaseMethod<Params> {
147147
await wait(3000);
148148
}
149149

150-
// Browser WebUSB needs device selection prompt, desktop WebUSB doesn't
151-
if (checkCount > 4 && DataManager.isBrowserWebUsb(DataManager.getSettings('env'))) {
150+
if (
151+
checkCount > 4 &&
152+
DataManager.isBrowserWebUsb(DataManager.getSettings('env')) &&
153+
!this.payload.skipWebDevicePrompt
154+
) {
152155
clearInterval(intervalTimer);
153156
clearTimeout(timeoutTimer);
154157

‎packages/core/src/api/firmware/FirmwareUpdateBaseMethod.ts‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,8 +137,11 @@ export class FirmwareUpdateBaseMethod<Params> extends BaseMethod<Params> {
137137
await wait(3000);
138138
}
139139

140-
// Browser WebUSB needs device selection prompt, desktop WebUSB doesn't
141-
if (checkCount > 4 && DataManager.isBrowserWebUsb(DataManager.getSettings('env'))) {
140+
if (
141+
checkCount > 4 &&
142+
DataManager.isBrowserWebUsb(DataManager.getSettings('env')) &&
143+
!this.payload.skipWebDevicePrompt
144+
) {
142145
clearInterval(intervalTimer);
143146
clearTimeout(timeoutTimer);
144147

‎packages/hd-ble-sdk/package.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@onekeyfe/hd-ble-sdk",
3-
"version": "1.1.19-alpha.7",
3+
"version": "1.1.19-alpha.8",
44
"author": "OneKey",
55
"homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
66
"license": "ISC",
@@ -20,8 +20,8 @@
2020
"lint:fix": "eslint . --fix"
2121
},
2222
"dependencies": {
23-
"@onekeyfe/hd-core": "1.1.19-alpha.7",
24-
"@onekeyfe/hd-shared": "1.1.19-alpha.7",
25-
"@onekeyfe/hd-transport-react-native": "1.1.19-alpha.7"
23+
"@onekeyfe/hd-core": "1.1.19-alpha.8",
24+
"@onekeyfe/hd-shared": "1.1.19-alpha.8",
25+
"@onekeyfe/hd-transport-react-native": "1.1.19-alpha.8"
2626
}
2727
}

‎packages/hd-common-connect-sdk/package.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@onekeyfe/hd-common-connect-sdk",
3-
"version": "1.1.19-alpha.7",
3+
"version": "1.1.19-alpha.8",
44
"author": "OneKey",
55
"homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
66
"license": "ISC",
@@ -20,11 +20,11 @@
2020
"lint:fix": "eslint . --fix"
2121
},
2222
"dependencies": {
23-
"@onekeyfe/hd-core": "1.1.19-alpha.7",
24-
"@onekeyfe/hd-shared": "1.1.19-alpha.7",
25-
"@onekeyfe/hd-transport-emulator": "1.1.19-alpha.7",
26-
"@onekeyfe/hd-transport-http": "1.1.19-alpha.7",
27-
"@onekeyfe/hd-transport-lowlevel": "1.1.19-alpha.7",
28-
"@onekeyfe/hd-transport-web-device": "1.1.19-alpha.7"
23+
"@onekeyfe/hd-core": "1.1.19-alpha.8",
24+
"@onekeyfe/hd-shared": "1.1.19-alpha.8",
25+
"@onekeyfe/hd-transport-emulator": "1.1.19-alpha.8",
26+
"@onekeyfe/hd-transport-http": "1.1.19-alpha.8",
27+
"@onekeyfe/hd-transport-lowlevel": "1.1.19-alpha.8",
28+
"@onekeyfe/hd-transport-web-device": "1.1.19-alpha.8"
2929
}
3030
}

‎packages/hd-transport-electron/package.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@onekeyfe/hd-transport-electron",
3-
"version": "1.1.19-alpha.7",
3+
"version": "1.1.19-alpha.8",
44
"author": "OneKey",
55
"homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
66
"license": "MIT",
@@ -25,9 +25,9 @@
2525
"electron-log": ">=4.0.0"
2626
},
2727
"dependencies": {
28-
"@onekeyfe/hd-core": "1.1.19-alpha.7",
29-
"@onekeyfe/hd-shared": "1.1.19-alpha.7",
30-
"@onekeyfe/hd-transport": "1.1.19-alpha.7",
28+
"@onekeyfe/hd-core": "1.1.19-alpha.8",
29+
"@onekeyfe/hd-shared": "1.1.19-alpha.8",
30+
"@onekeyfe/hd-transport": "1.1.19-alpha.8",
3131
"@stoprocent/noble": "2.3.4",
3232
"p-retry": "^4.6.2"
3333
},

‎packages/hd-transport-emulator/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@onekeyfe/hd-transport-emulator",
3-
"version": "1.1.19-alpha.7",
3+
"version": "1.1.19-alpha.8",
44
"description": "hardware emulator transport",
55
"author": "OneKey",
66
"homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
@@ -24,8 +24,8 @@
2424
"url": "https://github.com/OneKeyHQ/hardware-js-sdk/issues"
2525
},
2626
"dependencies": {
27-
"@onekeyfe/hd-shared": "1.1.19-alpha.7",
28-
"@onekeyfe/hd-transport": "1.1.19-alpha.7",
27+
"@onekeyfe/hd-shared": "1.1.19-alpha.8",
28+
"@onekeyfe/hd-transport": "1.1.19-alpha.8",
2929
"axios": "1.12.2",
3030
"secure-json-parse": "^4.0.0"
3131
}

0 commit comments

Comments
 (0)