Merge pull request #8105 from LedgerHQ/support/hotfix-merge-conflicts

🚨 Hotfix merge conflicts

apps/cli/CHANGELOG.md

@@ -1,5 +1,29 @@
 # @ledgerhq/live-cli
 
+## 24.7.2
+
+### Patch Changes
+
+- Updated dependencies [[`80e333c`](https://github.com/LedgerHQ/ledger-live/commit/80e333c30afdc7d14f1b5fd3e92c9fb10372e2c1), [`d8c171a`](https://github.com/LedgerHQ/ledger-live/commit/d8c171a6ed32012733786bde29b5493b1106cf56)]:
+  - @ledgerhq/live-common@34.11.1
+  - @ledgerhq/coin-framework@0.18.4
+  - @ledgerhq/coin-bitcoin@0.8.4
+  - @ledgerhq/device-core@0.4.3
+  - @ledgerhq/live-countervalues@0.2.9
+  - @ledgerhq/live-wallet@0.7.1
+
+## 24.7.2-hotfix.0
+
+### Patch Changes
+
+- Updated dependencies [[`80e333c`](https://github.com/LedgerHQ/ledger-live/commit/80e333c30afdc7d14f1b5fd3e92c9fb10372e2c1), [`d8c171a`](https://github.com/LedgerHQ/ledger-live/commit/d8c171a6ed32012733786bde29b5493b1106cf56)]:
+  - @ledgerhq/live-common@34.11.1-hotfix.0
+  - @ledgerhq/coin-framework@0.18.4-hotfix.0
+  - @ledgerhq/coin-bitcoin@0.8.4-hotfix.0
+  - @ledgerhq/device-core@0.4.3-hotfix.0
+  - @ledgerhq/live-countervalues@0.2.9-hotfix.0
+  - @ledgerhq/live-wallet@0.7.1-hotfix.0
+
 ## 24.7.1
 
 ### Patch Changes

apps/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ledgerhq/live-cli",
-  "version": "24.7.1",
+  "version": "24.7.2",
   "description": "ledger-live CLI version",
   "repository": {
     "type": "git",

apps/ledger-live-desktop/CHANGELOG.md

@@ -1,5 +1,49 @@
 # ledger-live-desktop
 
+## 2.89.1
+
+### Patch Changes
+
+- [#8089](https://github.com/LedgerHQ/ledger-live/pull/8089) [`80e333c`](https://github.com/LedgerHQ/ledger-live/commit/80e333c30afdc7d14f1b5fd3e92c9fb10372e2c1) Thanks [@live-github-bot](https://github.com/apps/live-github-bot)! - add ptxSwapCoreExperiment flag
+
+- [#8089](https://github.com/LedgerHQ/ledger-live/pull/8089) [`d8c171a`](https://github.com/LedgerHQ/ledger-live/commit/d8c171a6ed32012733786bde29b5493b1106cf56) Thanks [@live-github-bot](https://github.com/apps/live-github-bot)! - hotfix: [swap] add ptxSwapCoreExperiment flag
+
+- Updated dependencies [[`80e333c`](https://github.com/LedgerHQ/ledger-live/commit/80e333c30afdc7d14f1b5fd3e92c9fb10372e2c1), [`d8c171a`](https://github.com/LedgerHQ/ledger-live/commit/d8c171a6ed32012733786bde29b5493b1106cf56)]:
+  - @ledgerhq/[email protected]
+  - @ledgerhq/[email protected]
+  - @ledgerhq/[email protected]
+  - @ledgerhq/[email protected]
+  - @ledgerhq/[email protected]
+  - @ledgerhq/[email protected]
+  - @ledgerhq/[email protected]
+  - @ledgerhq/[email protected]
+  - @ledgerhq/[email protected]
+  - @ledgerhq/[email protected]
+  - @ledgerhq/[email protected]
+  - @ledgerhq/[email protected]
+
+## 2.89.1-hotfix.0
+
+### Patch Changes
+
+- [#8089](https://github.com/LedgerHQ/ledger-live/pull/8089) [`80e333c`](https://github.com/LedgerHQ/ledger-live/commit/80e333c30afdc7d14f1b5fd3e92c9fb10372e2c1) Thanks [@live-github-bot](https://github.com/apps/live-github-bot)! - add ptxSwapCoreExperiment flag
+
+- [#8089](https://github.com/LedgerHQ/ledger-live/pull/8089) [`d8c171a`](https://github.com/LedgerHQ/ledger-live/commit/d8c171a6ed32012733786bde29b5493b1106cf56) Thanks [@live-github-bot](https://github.com/apps/live-github-bot)! - hotfix: [swap] add ptxSwapCoreExperiment flag
+
+- Updated dependencies [[`80e333c`](https://github.com/LedgerHQ/ledger-live/commit/80e333c30afdc7d14f1b5fd3e92c9fb10372e2c1), [`d8c171a`](https://github.com/LedgerHQ/ledger-live/commit/d8c171a6ed32012733786bde29b5493b1106cf56)]:
+  - @ledgerhq/[email protected]
+  - @ledgerhq/[email protected]
+  - @ledgerhq/[email protected]
+  - @ledgerhq/[email protected]
+  - @ledgerhq/[email protected]
+  - @ledgerhq/[email protected]
+  - @ledgerhq/[email protected]
+  - @ledgerhq/[email protected]
+  - @ledgerhq/[email protected]
+  - @ledgerhq/[email protected]
+  - @ledgerhq/[email protected]
+  - @ledgerhq/[email protected]
+
 ## 2.89.0
 
 ### Minor Changes

apps/ledger-live-desktop/RELEASE_NOTES.md

@@ -1,3 +1,7 @@
+# 2.89.1
+
+This release includes minor bug fixes.
+
 # 2.89.0
 
 This release includes small security improvements, UI tweaks, and minor bug fixes.

apps/ledger-live-desktop/package.json

@@ -13,7 +13,7 @@
   "license": "MIT",
   "private": true,
   "main": "./.webpack/main.bundle.js",
-  "version": "2.89.0",
+  "version": "2.89.1",
   "scripts": {
     "start:prod": "electron ./.webpack/main.bundle.js",
     "start": "cross-env NODE_ENV=development node ./tools/main.js",

apps/ledger-live-mobile/CHANGELOG.md

@@ -1,5 +1,41 @@
 # live-mobile
 
+## 3.52.1
+
+### Patch Changes
+
+- Updated dependencies [[`80e333c`](https://github.com/LedgerHQ/ledger-live/commit/80e333c30afdc7d14f1b5fd3e92c9fb10372e2c1), [`d8c171a`](https://github.com/LedgerHQ/ledger-live/commit/d8c171a6ed32012733786bde29b5493b1106cf56)]:
+  - @ledgerhq/[email protected]
+  - @ledgerhq/[email protected]
+  - @ledgerhq/[email protected]
+  - @ledgerhq/[email protected]
+  - @ledgerhq/[email protected]
+  - @ledgerhq/[email protected]
+  - @ledgerhq/[email protected]
+  - @ledgerhq/[email protected]
+  - @ledgerhq/[email protected]
+  - @ledgerhq/[email protected]
+  - @ledgerhq/[email protected]
+  - @ledgerhq/[email protected]
+
+## 3.52.1-hotfix.0
+
+### Patch Changes
+
+- Updated dependencies [[`80e333c`](https://github.com/LedgerHQ/ledger-live/commit/80e333c30afdc7d14f1b5fd3e92c9fb10372e2c1), [`d8c171a`](https://github.com/LedgerHQ/ledger-live/commit/d8c171a6ed32012733786bde29b5493b1106cf56)]:
+  - @ledgerhq/[email protected]
+  - @ledgerhq/[email protected]
+  - @ledgerhq/[email protected]
+  - @ledgerhq/[email protected]
+  - @ledgerhq/[email protected]
+  - @ledgerhq/[email protected]
+  - @ledgerhq/[email protected]
+  - @ledgerhq/[email protected]
+  - @ledgerhq/[email protected]
+  - @ledgerhq/[email protected]
+  - @ledgerhq/[email protected]
+  - @ledgerhq/[email protected]
+
 ## 3.52.0
 
 ### Minor Changes

apps/ledger-live-mobile/package.json

@@ -1,6 +1,6 @@
 {
   "name": "live-mobile",
-  "version": "3.52.0",
+  "version": "3.52.1",
   "private": true,
   "scripts": {
     "postinstall": "zx ./scripts/post.mjs",

apps/web-tools/CHANGELOG.md

@@ -1,5 +1,29 @@
 # web-tools
 
+## 0.10.1
+
+### Patch Changes
+
+- Updated dependencies [[`80e333c`](https://github.com/LedgerHQ/ledger-live/commit/80e333c30afdc7d14f1b5fd3e92c9fb10372e2c1), [`d8c171a`](https://github.com/LedgerHQ/ledger-live/commit/d8c171a6ed32012733786bde29b5493b1106cf56)]:
+  - @ledgerhq/types-live@6.52.2
+  - @ledgerhq/live-common@34.11.1
+  - @ledgerhq/coin-framework@0.18.4
+  - @ledgerhq/domain-service@1.2.8
+  - @ledgerhq/hw-app-eth@6.40.1
+  - @ledgerhq/live-wallet@0.7.1
+
+## 0.10.1-hotfix.0
+
+### Patch Changes
+
+- Updated dependencies [[`80e333c`](https://github.com/LedgerHQ/ledger-live/commit/80e333c30afdc7d14f1b5fd3e92c9fb10372e2c1), [`d8c171a`](https://github.com/LedgerHQ/ledger-live/commit/d8c171a6ed32012733786bde29b5493b1106cf56)]:
+  - @ledgerhq/types-live@6.52.2-hotfix.0
+  - @ledgerhq/live-common@34.11.1-hotfix.0
+  - @ledgerhq/coin-framework@0.18.4-hotfix.0
+  - @ledgerhq/domain-service@1.2.8-hotfix.0
+  - @ledgerhq/hw-app-eth@6.40.1-hotfix.0
+  - @ledgerhq/live-wallet@0.7.1-hotfix.0
+
 ## 0.10.0
 
 ### Minor Changes

apps/web-tools/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ledgerhq/web-tools",
-  "version": "0.10.0",
+  "version": "0.10.1",
   "private": true,
   "browser": {
     "fs": false,

libs/coin-framework/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @ledgerhq/coin-framework
 
+## 0.18.4
+
+### Patch Changes
+
+- Updated dependencies [[`80e333c`](https://github.com/LedgerHQ/ledger-live/commit/80e333c30afdc7d14f1b5fd3e92c9fb10372e2c1), [`d8c171a`](https://github.com/LedgerHQ/ledger-live/commit/d8c171a6ed32012733786bde29b5493b1106cf56)]:
+  - @ledgerhq/[email protected]
+
+## 0.18.4-hotfix.0
+
+### Patch Changes
+
+- Updated dependencies [[`80e333c`](https://github.com/LedgerHQ/ledger-live/commit/80e333c30afdc7d14f1b5fd3e92c9fb10372e2c1), [`d8c171a`](https://github.com/LedgerHQ/ledger-live/commit/d8c171a6ed32012733786bde29b5493b1106cf56)]:
+  - @ledgerhq/[email protected]
+
 ## 0.18.3
 
 ### Patch Changes

libs/coin-framework/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ledgerhq/coin-framework",
-  "version": "0.18.3",
+  "version": "0.18.4",
   "description": "Ledger framework for Coin integration",
   "keywords": [
     "Ledger",

libs/coin-modules/coin-algorand/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @ledgerhq/coin-algorand
 
+## 0.5.9
+
+### Patch Changes
+
+- Updated dependencies [[`80e333c`](https://github.com/LedgerHQ/ledger-live/commit/80e333c30afdc7d14f1b5fd3e92c9fb10372e2c1), [`d8c171a`](https://github.com/LedgerHQ/ledger-live/commit/d8c171a6ed32012733786bde29b5493b1106cf56)]:
+  - @ledgerhq/[email protected]
+  - @ledgerhq/[email protected]
+
+## 0.5.9-hotfix.0
+
+### Patch Changes
+
+- Updated dependencies [[`80e333c`](https://github.com/LedgerHQ/ledger-live/commit/80e333c30afdc7d14f1b5fd3e92c9fb10372e2c1), [`d8c171a`](https://github.com/LedgerHQ/ledger-live/commit/d8c171a6ed32012733786bde29b5493b1106cf56)]:
+  - @ledgerhq/[email protected]
+  - @ledgerhq/[email protected]
+
 ## 0.5.8
 
 ### Patch Changes

libs/coin-modules/coin-algorand/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ledgerhq/coin-algorand",
-  "version": "0.5.8",
+  "version": "0.5.9",
   "description": "Ledger Algorand Coin integration",
   "keywords": [
     "Ledger",

libs/coin-modules/coin-bitcoin/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @ledgerhq/coin-bitcoin
 
+## 0.8.4
+
+### Patch Changes
+
+- Updated dependencies [[`80e333c`](https://github.com/LedgerHQ/ledger-live/commit/80e333c30afdc7d14f1b5fd3e92c9fb10372e2c1), [`d8c171a`](https://github.com/LedgerHQ/ledger-live/commit/d8c171a6ed32012733786bde29b5493b1106cf56)]:
+  - @ledgerhq/[email protected]
+  - @ledgerhq/[email protected]
+
+## 0.8.4-hotfix.0
+
+### Patch Changes
+
+- Updated dependencies [[`80e333c`](https://github.com/LedgerHQ/ledger-live/commit/80e333c30afdc7d14f1b5fd3e92c9fb10372e2c1), [`d8c171a`](https://github.com/LedgerHQ/ledger-live/commit/d8c171a6ed32012733786bde29b5493b1106cf56)]:
+  - @ledgerhq/[email protected]
+  - @ledgerhq/[email protected]
+
 ## 0.8.3
 
 ### Patch Changes

libs/coin-modules/coin-bitcoin/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ledgerhq/coin-bitcoin",
-  "version": "0.8.3",
+  "version": "0.8.4",
   "description": "Ledger Bitcoin Coin integration",
   "keywords": [
     "Ledger",

libs/coin-modules/coin-cardano/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @ledgerhq/coin-cardano
 
+## 0.2.4
+
+### Patch Changes
+
+- Updated dependencies [[`80e333c`](https://github.com/LedgerHQ/ledger-live/commit/80e333c30afdc7d14f1b5fd3e92c9fb10372e2c1), [`d8c171a`](https://github.com/LedgerHQ/ledger-live/commit/d8c171a6ed32012733786bde29b5493b1106cf56)]:
+  - @ledgerhq/[email protected]
+  - @ledgerhq/[email protected]
+
+## 0.2.4-hotfix.0
+
+### Patch Changes
+
+- Updated dependencies [[`80e333c`](https://github.com/LedgerHQ/ledger-live/commit/80e333c30afdc7d14f1b5fd3e92c9fb10372e2c1), [`d8c171a`](https://github.com/LedgerHQ/ledger-live/commit/d8c171a6ed32012733786bde29b5493b1106cf56)]:
+  - @ledgerhq/[email protected]
+  - @ledgerhq/[email protected]
+
 ## 0.2.3
 
 ### Patch Changes

libs/coin-modules/coin-cardano/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ledgerhq/coin-cardano",
-  "version": "0.2.3",
+  "version": "0.2.4",
   "description": "Ledger Cardano Coin integration",
   "keywords": [
     "Ledger",

libs/coin-modules/coin-cosmos/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @ledgerhq/coin-cosmos
 
+## 0.1.5
+
+### Patch Changes
+
+- Updated dependencies [[`80e333c`](https://github.com/LedgerHQ/ledger-live/commit/80e333c30afdc7d14f1b5fd3e92c9fb10372e2c1), [`d8c171a`](https://github.com/LedgerHQ/ledger-live/commit/d8c171a6ed32012733786bde29b5493b1106cf56)]:
+  - @ledgerhq/[email protected]
+  - @ledgerhq/[email protected]
+
+## 0.1.5-hotfix.0
+
+### Patch Changes
+
+- Updated dependencies [[`80e333c`](https://github.com/LedgerHQ/ledger-live/commit/80e333c30afdc7d14f1b5fd3e92c9fb10372e2c1), [`d8c171a`](https://github.com/LedgerHQ/ledger-live/commit/d8c171a6ed32012733786bde29b5493b1106cf56)]:
+  - @ledgerhq/[email protected]
+  - @ledgerhq/[email protected]
+
 ## 0.1.4
 
 ### Patch Changes

libs/coin-modules/coin-cosmos/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ledgerhq/coin-cosmos",
-  "version": "0.1.4",
+  "version": "0.1.5",
   "description": "Ledger Cosmos Coin integration",
   "keywords": [
     "Ledger",

libs/coin-modules/coin-elrond/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @ledgerhq/coin-elrond
 
+## 0.1.4
+
+### Patch Changes
+
+- Updated dependencies [[`80e333c`](https://github.com/LedgerHQ/ledger-live/commit/80e333c30afdc7d14f1b5fd3e92c9fb10372e2c1), [`d8c171a`](https://github.com/LedgerHQ/ledger-live/commit/d8c171a6ed32012733786bde29b5493b1106cf56)]:
+  - @ledgerhq/[email protected]
+  - @ledgerhq/[email protected]
+
+## 0.1.4-hotfix.0
+
+### Patch Changes
+
+- Updated dependencies [[`80e333c`](https://github.com/LedgerHQ/ledger-live/commit/80e333c30afdc7d14f1b5fd3e92c9fb10372e2c1), [`d8c171a`](https://github.com/LedgerHQ/ledger-live/commit/d8c171a6ed32012733786bde29b5493b1106cf56)]:
+  - @ledgerhq/[email protected]
+  - @ledgerhq/[email protected]
+
 ## 0.1.3
 
 ### Patch Changes

libs/coin-modules/coin-elrond/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ledgerhq/coin-elrond",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "description": "Ledger MultiversX Coin integration",
   "keywords": [
     "Ledger",

libs/coin-modules/coin-evm/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @ledgerhq/coin-evm
 
+## 2.4.1
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @ledgerhq/[email protected]
+  - @ledgerhq/[email protected]
+  - @ledgerhq/[email protected]
+
+## 2.4.1-hotfix.0
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @ledgerhq/[email protected]
+  - @ledgerhq/[email protected]
+  - @ledgerhq/[email protected]
+
 ## 2.4.0
 
 ### Minor Changes