Skip to content

Commit 6309fd1

Browse files
committed
Merge remote-tracking branch 'origin/develop' into feature/jest-unit-tests
2 parents 3afbad6 + 09df398 commit 6309fd1

File tree

3 files changed

+13
-4
lines changed

3 files changed

+13
-4
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@ Changelog
1313
- Updated Electron and related packages ([PR 2206](https://github.com/input-output-hk/daedalus/pull/2206))
1414
- Fixed some Japanese translations for the external currencies ([PR 2667](https://github.com/input-output-hk/daedalus/pull/2667))
1515

16+
### Chores
17+
18+
- Updated `trezor-connect` dependency to version `8.2.0` ([PR 2675](https://github.com/input-output-hk/daedalus/pull/2675))
19+
1620
## 4.3.1
1721

1822
### Fixes

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@
250250
"source-map-support": "0.5.19",
251251
"spectron-fake-dialog": "0.0.1",
252252
"tcp-port-used": "1.0.1",
253-
"trezor-connect": "8.1.30-beta.4",
253+
"trezor-connect": "8.2.0-extended",
254254
"unorm": "1.6.0",
255255
"validator": "13.1.17"
256256
},

yarn.lock

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2270,6 +2270,10 @@
22702270
tiny-worker "^2.3.0"
22712271
ws "^7.4.0"
22722272

2273+
"@trezor/connect-common@^0.0.2":
2274+
version "0.0.2"
2275+
resolved "https://registry.yarnpkg.com/@trezor/connect-common/-/connect-common-0.0.2.tgz#d2bb1e90de6be2895b7f44215f09b52db361aaf4"
2276+
22732277
"@trezor/rollout@^1.2.0":
22742278
version "1.2.0"
22752279
resolved "https://registry.yarnpkg.com/@trezor/rollout/-/rollout-1.2.0.tgz#827316debc5cf2e8af2210900eb49540ea2753d1"
@@ -17148,12 +17152,13 @@ tree-kill@^1.1.0, tree-kill@^1.2.2:
1714817152
version "1.2.2"
1714917153
resolved "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.2.tgz#4ca09a9092c88b73a7cdc5e8a01b507b0790a0cc"
1715017154

17151-
trezor-connect@8.1.30-beta.4:
17152-
version "8.1.30-beta.4"
17153-
resolved "https://registry.yarnpkg.com/trezor-connect/-/trezor-connect-8.1.30-beta.4.tgz#337b2de73f3973c484e5493a3b5c424dd8ae56f8"
17155+
trezor-connect@8.2.0-extended:
17156+
version "8.2.0-extended"
17157+
resolved "https://registry.yarnpkg.com/trezor-connect/-/trezor-connect-8.2.0-extended.tgz#b33d3c7f4505cb5aee8acc1f8565410a1a811530"
1715417158
dependencies:
1715517159
"@babel/runtime" "^7.12.5"
1715617160
"@trezor/blockchain-link" "^1.0.17"
17161+
"@trezor/connect-common" "^0.0.2"
1715717162
"@trezor/rollout" "^1.2.0"
1715817163
"@trezor/utxo-lib" "^0.1.2"
1715917164
bchaddrjs "^0.5.2"

0 commit comments

Comments
 (0)