Revert hotfix commits (#2091)

* Revert ":fire: hotfix release [skip ci]" This reverts commit e0e5bb6. * Revert ":fire: hotfix prerelease [LLD(2.51.0-hotfix.0)]" This reverts commit 252aa67. * Revert ":rocket: entering LLD hotfix mode" This reverts commit 8f708eb. * Revert ":fire: hotfix release [skip ci]" This reverts commit 4ca8f86. * Revert "Update wording" This reverts commit fea165d. * Revert "add energy lt for warning message to be display" This reverts commit 693e44e. * Revert "add more feelimit to tron trc20" This reverts commit 1910b23. * Revert ":fire: hotfix prerelease [LLM(3.12.0)]" This reverts commit de77a92. * Revert ":rocket: entering LLM hotfix mode" This reverts commit 42df4fc.
LedgerHQ · Dec 9, 2022 · 909b9ed · 909b9ed · vercel · Dec 9, 2022
1 parent e0e5bb6
commit 909b9ed
Show file tree

Hide file tree

Showing 19 changed files with 35 additions and 68 deletions.
diff --git a/.changeset/ninety-eggs-look.md b/.changeset/ninety-eggs-look.md
@@ -0,0 +1,5 @@
+---
+"ledger-live-desktop": patch
+---
+
+LLD - Handle ECONNRESET error in manager
diff --git a/.changeset/pink-houses-do.md b/.changeset/pink-houses-do.md
@@ -0,0 +1,5 @@
+---
+"ledger-live-desktop": patch
+---
+
+Remove redirection to account details from receive banner
diff --git a/.changeset/shy-bats-end.md b/.changeset/shy-bats-end.md
@@ -0,0 +1,5 @@
+---
+"ledger-live-desktop": patch
+---
+
+Improve cic logo
diff --git a/.changeset/slow-crabs-develop.md b/.changeset/slow-crabs-develop.md
@@ -0,0 +1,5 @@
+---
+"ledger-live-desktop": minor
+---
+
+Add swap data track
diff --git a/.changeset/spicy-jeans-study.md b/.changeset/spicy-jeans-study.md
@@ -0,0 +1,5 @@
+---
+"ledger-live-desktop": minor
+---
+
+Add more explicit error on tron trc20
diff --git a/apps/cli/CHANGELOG.md b/apps/cli/CHANGELOG.md
@@ -1,12 +1,5 @@
 # @ledgerhq/live-cli
 
-## 22.5.1
-
-### Patch Changes
-
-- Updated dependencies [[`1910b239af`](https://github.com/LedgerHQ/ledger-live/commit/1910b239af7b1c3533721ddc5edea6c4297363a6)]:
-  - @ledgerhq/live-common@27.10.0
-
 ## 22.5.0
 
 ### Minor Changes

diff --git a/apps/cli/package.json b/apps/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ledgerhq/live-cli",
-  "version": "22.5.1",
+  "version": "22.5.0",
   "description": "ledger-live CLI version",
   "repository": {
     "type": "git",

diff --git a/apps/ledger-live-desktop/CHANGELOG.md b/apps/ledger-live-desktop/CHANGELOG.md
@@ -1,37 +1,5 @@
 # ledger-live-desktop
 
-## 2.51.0
-
-### Minor Changes
-
-- [#1642](https://github.com/LedgerHQ/ledger-live/pull/1642) [`62f17e6c9b`](https://github.com/LedgerHQ/ledger-live/commit/62f17e6c9b7960783987441c1f213d9223eefd09) Thanks [@sarneijim](https://github.com/sarneijim)! - Add swap data track
-
-* [#1962](https://github.com/LedgerHQ/ledger-live/pull/1962) [`d96bcf101d`](https://github.com/LedgerHQ/ledger-live/commit/d96bcf101d5f023fd75e8ee6e0bcaebc83cad07d) Thanks [@henrily-ledger](https://github.com/henrily-ledger)! - Add more explicit error on tron trc20
-
-### Patch Changes
-
-- [#1899](https://github.com/LedgerHQ/ledger-live/pull/1899) [`f29d3d9384`](https://github.com/LedgerHQ/ledger-live/commit/f29d3d9384f57c99c228749673d4f5d840b4bf06) Thanks [@LFBarreto](https://github.com/LFBarreto)! - LLD - Handle ECONNRESET error in manager
-
-* [#1986](https://github.com/LedgerHQ/ledger-live/pull/1986) [`1ad947ba07`](https://github.com/LedgerHQ/ledger-live/commit/1ad947ba07c0c0d9f3469746a6a23ae50dd5a0f2) Thanks [@sarneijim](https://github.com/sarneijim)! - Remove redirection to account details from receive banner
-
-- [#1956](https://github.com/LedgerHQ/ledger-live/pull/1956) [`7f95a94ef2`](https://github.com/LedgerHQ/ledger-live/commit/7f95a94ef265afa4b5c3df878ae20b7ae62f8185) Thanks [@sarneijim](https://github.com/sarneijim)! - Improve cic logo
-
-## 2.51.0-hotfix.0
-
-### Minor Changes
-
-- [#1642](https://github.com/LedgerHQ/ledger-live/pull/1642) [`62f17e6c9b`](https://github.com/LedgerHQ/ledger-live/commit/62f17e6c9b7960783987441c1f213d9223eefd09) Thanks [@sarneijim](https://github.com/sarneijim)! - Add swap data track
-
-* [#1962](https://github.com/LedgerHQ/ledger-live/pull/1962) [`d96bcf101d`](https://github.com/LedgerHQ/ledger-live/commit/d96bcf101d5f023fd75e8ee6e0bcaebc83cad07d) Thanks [@henrily-ledger](https://github.com/henrily-ledger)! - Add more explicit error on tron trc20
-
-### Patch Changes
-
-- [#1899](https://github.com/LedgerHQ/ledger-live/pull/1899) [`f29d3d9384`](https://github.com/LedgerHQ/ledger-live/commit/f29d3d9384f57c99c228749673d4f5d840b4bf06) Thanks [@LFBarreto](https://github.com/LFBarreto)! - LLD - Handle ECONNRESET error in manager
-
-* [#1986](https://github.com/LedgerHQ/ledger-live/pull/1986) [`1ad947ba07`](https://github.com/LedgerHQ/ledger-live/commit/1ad947ba07c0c0d9f3469746a6a23ae50dd5a0f2) Thanks [@sarneijim](https://github.com/sarneijim)! - Remove redirection to account details from receive banner
-
-- [#1956](https://github.com/LedgerHQ/ledger-live/pull/1956) [`7f95a94ef2`](https://github.com/LedgerHQ/ledger-live/commit/7f95a94ef265afa4b5c3df878ae20b7ae62f8185) Thanks [@sarneijim](https://github.com/sarneijim)! - Improve cic logo
-
 ## 2.50.0
 
 ### Minor Changes

diff --git a/apps/ledger-live-desktop/package.json b/apps/ledger-live-desktop/package.json
@@ -16,7 +16,7 @@
   "license": "MIT",
   "private": true,
   "main": "./.webpack/main.bundle.js",
-  "version": "2.51.0",
+  "version": "2.50.0",
   "scripts": {
     "start:prod": "electron ./.webpack/main.bundle.js",
     "start": "cross-env NODE_ENV=development node ./tools/main.js",

diff --git a/apps/ledger-live-desktop/static/i18n/en/app.json b/apps/ledger-live-desktop/static/i18n/en/app.json
@@ -5132,7 +5132,7 @@
       "description": "Signature must be applied within 30 seconds. Please try again."
     },
     "TronNotEnoughEnergy": {
-      "title": "Energy is lower than necessary. You might pay up to 20TRX in fees."
+      "title": "Not enough Energy to send this token"
     },
     "PairingFailed": {
       "title": "Pairing unsuccessful",

diff --git a/apps/ledger-live-mobile/CHANGELOG.md b/apps/ledger-live-mobile/CHANGELOG.md
@@ -1,12 +1,5 @@
 # live-mobile
 
-## 3.12.1
-
-### Patch Changes
-
-- Updated dependencies [[`1910b239af`](https://github.com/LedgerHQ/ledger-live/commit/1910b239af7b1c3533721ddc5edea6c4297363a6)]:
-  - @ledgerhq/live-common@27.10.0
-
 ## 3.12.0
 
 ### Minor Changes

diff --git a/apps/ledger-live-mobile/package.json b/apps/ledger-live-mobile/package.json
@@ -3,7 +3,7 @@
     "node": ">=14"
   },
   "name": "live-mobile",
-  "version": "3.12.1",
+  "version": "3.12.0",
   "private": true,
   "scripts": {
     "postinstall": "zx ./scripts/post.mjs",

diff --git a/apps/ledger-live-mobile/src/locales/en/common.json b/apps/ledger-live-mobile/src/locales/en/common.json
@@ -532,7 +532,7 @@
       "description": "Transactions must be signed within 30 seconds. Please try again."
     },
     "TronNotEnoughEnergy": {
-      "title": "Energy is lower than necessary. You might pay up to 20TRX in fees."
+      "title": "Not enough Energy to send this token"
     },
     "UpdateYourApp": {
       "title": "App update needed",

diff --git a/libs/ledger-live-common/CHANGELOG.md b/libs/ledger-live-common/CHANGELOG.md
@@ -1,11 +1,5 @@
 # @ledgerhq/live-common
 
-## 27.10.0
-
-### Minor Changes
-
-- [#2087](https://github.com/LedgerHQ/ledger-live/pull/2087) [`1910b239af`](https://github.com/LedgerHQ/ledger-live/commit/1910b239af7b1c3533721ddc5edea6c4297363a6) Thanks [@github-actions](https://github.com/apps/github-actions)! - Change tron trc20 fees limit when no energy
-
 ## 27.9.0
 
 ### Minor Changes

diff --git a/libs/ledger-live-common/package.json b/libs/ledger-live-common/package.json
@@ -4,7 +4,7 @@
   },
   "name": "@ledgerhq/live-common",
   "description": "Common ground for the Ledger Live apps",
-  "version": "27.10.0",
+  "version": "27.9.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/LedgerHQ/ledger-live.git"

diff --git a/libs/ledger-live-common/src/api/Tron.ts b/libs/ledger-live-common/src/api/Tron.ts
@@ -119,7 +119,7 @@ export const createTronTransaction = async (
   if (tokenType === "trc20" && tokenId) {
     const txData: SmartContractTransactionData = {
       function_selector: "transfer(address,uint256)",
-      fee_limit: 20000000,
+      fee_limit: 10000000,
       call_value: 0,
       contract_address: decode58Check(tokenId),
       parameter: abiEncodeTrc20Transfer(decode58Check(t.recipient), t.amount),

diff --git a/libs/ledger-live-common/src/families/tron/bridge/js.ts b/libs/ledger-live-common/src/families/tron/bridge/js.ts
@@ -744,7 +744,8 @@ const getTransactionStatus = async (
     if (
       account.type === "TokenAccount" &&
       account.token.tokenType === "trc20" &&
-      energy.lt(29650) // temporary value corresponding to usdt trc20 energy
+      energy.eq(0) &&
+      a.spendableBalance.lt(1000000)
     ) {
       const contractUserEnergyConsumption =
         await getContractUserEnergyRatioConsumption(

diff --git a/tools/common-tools/CHANGELOG.md b/tools/common-tools/CHANGELOG.md
@@ -1,12 +1,5 @@
 # live-common-tools
 
-## 0.2.19
-
-### Patch Changes
-
-- Updated dependencies [[`1910b239af`](https://github.com/LedgerHQ/ledger-live/commit/1910b239af7b1c3533721ddc5edea6c4297363a6)]:
-  - @ledgerhq/live-common@27.10.0
-
 ## 0.2.18
 
 ### Patch Changes

diff --git a/tools/common-tools/package.json b/tools/common-tools/package.json
@@ -1,6 +1,6 @@
 {
   "name": "live-common-tools",
-  "version": "0.2.19",
+  "version": "0.2.18",
   "private": true,
   "dependencies": {
     "@ledgerhq/devices": "workspace:^",