[Chore(release)] resolve release merge conflicts with main (#7206)

* chore(hotfix) 🚀 entering hotfix mode * Polkadot generic app support (#6326) * getAddress support * fix: add metadata support * fix: get polkadot app version * fix: refactoring * fix: refactoring * fix: refactoring * fix: refactoring * fix: small refactoring * fix: update doc * feat: add Polkadot coin configuration Signed-off-by: Stéphane Prohaszka <[email protected]> * polkadot config location * fix: polkadot transaction craft * remove useless code * fix: refactoring * fix: runtime upgrade transaction * fix: update doc * fix: unit tests * fix: update changelog * fix: update pnpm-lock * fix: update polkadot integration test APDU --------- Signed-off-by: Stéphane Prohaszka <[email protected]> Co-authored-by: hzheng-ledger <[email protected]> Co-authored-by: Stéphane Prohaszka <[email protected]> Co-authored-by: lvndry <[email protected]> * chore(hotfix): 🔥 hotfix prerelease [LLD(2.82.1-hotfix.0), LLM(3.45.1-hotfix.0)] * fix(llm): improve typing of ReceiveFunds/02-SelectAccount and fix crash case (#7148) * chore(hotfix): 🔥 hotfix prerelease [LLD(2.82.1-hotfix.0), LLM(3.45.1-hotfix.1)] * chore(hotfix): 🔥 hotfix release [skip ci] * chore: add changeset * fix: move polkdot getcrypto call outside of currency config fn --------- Signed-off-by: Stéphane Prohaszka <[email protected]> Co-authored-by: live-github-bot[bot] <105061298+live-github-bot[bot]@users.noreply.github.com> Co-authored-by: Hedi EDELBLOUTE <[email protected]> Co-authored-by: hzheng-ledger <[email protected]> Co-authored-by: Stéphane Prohaszka <[email protected]> Co-authored-by: lvndry <[email protected]> Co-authored-by: @greweb <[email protected]>
LedgerHQ · Jun 26, 2024 · 81e5b8b · 81e5b8b
1 parent 9e0c383
commit 81e5b8b
Show file tree

Hide file tree

Showing 21 changed files with 314 additions and 133 deletions.
diff --git a/.changeset/sweet-dancers-hide.md b/.changeset/sweet-dancers-hide.md
@@ -0,0 +1,45 @@
+---
+"@ledgerhq/hw-transport-node-hid-singleton": patch
+"@ledgerhq/hw-transport-node-hid-noevents": patch
+"@ledgerhq/swift-bridge-hw-app-eth": patch
+"@ledgerhq/hw-transport-node-hid": patch
+"@ledgerhq/hw-app-polkadot": patch
+"@ledgerhq/context-module": patch
+"@ledgerhq/cryptoassets": patch
+"@ledgerhq/keyring-eth": patch
+"@ledgerhq/hw-app-eth": patch
+"@ledgerhq/hw-app-str": patch
+"@ledgerhq/hw-app-vet": patch
+"@ledgerhq/types-live": patch
+"@ledgerhq/coin-algorand": patch
+"@ledgerhq/coin-polkadot": patch
+"@ledgerhq/coin-bitcoin": patch
+"@ledgerhq/coin-cardano": patch
+"@ledgerhq/coin-solana": patch
+"@ledgerhq/live-countervalues-react": patch
+"@ledgerhq/coin-tezos": patch
+"@ledgerhq/coin-near": patch
+"@ledgerhq/webpack.js-example": patch
+"@ledgerhq/coin-evm": patch
+"@ledgerhq/coin-xrp": patch
+"ledger-live-desktop": patch
+"@ledgerhq/next.js-example": patch
+"live-mobile": patch
+"@ledgerhq/live-common": patch
+"@ledgerhq/live-countervalues": patch
+"@ledgerhq/react-ui": patch
+"@ledgerhq/dummy-wallet-app": patch
+"@ledgerhq/coin-framework": patch
+"@ledgerhq/domain-service": patch
+"@ledgerhq/live-nft-react": patch
+"@ledgerhq/device-react": patch
+"@ledgerhq/device-core": patch
+"@ledgerhq/live-wallet": patch
+"@ledgerhq/test-utils": patch
+"@ledgerhq/web-tools": patch
+"@ledgerhq/evm-tools": patch
+"@ledgerhq/live-nft": patch
+"@ledgerhq/live-cli": patch
+---
+
+chore: resolve merge conflicts
diff --git a/apps/cli/CHANGELOG.md b/apps/cli/CHANGELOG.md
@@ -1,6 +1,6 @@
 # @ledgerhq/live-cli
 
-## 24.3.1-next.4
+## 24.3.2-next.4
 
 ### Patch Changes
 
@@ -12,28 +12,28 @@
   - @ledgerhq/live-countervalues@0.2.1-next.1
   - @ledgerhq/live-wallet@0.3.0-next.1
 
-## 24.3.1-next.3
+## 24.3.2-next.3
 
 ### Patch Changes
 
 - Updated dependencies []:
   - @ledgerhq/live-common@34.4.0-next.2
 
-## 24.3.1-next.2
+## 24.3.2-next.2
 
 ### Patch Changes
 
 - Updated dependencies []:
   - @ledgerhq/live-common@34.4.0-next.1
 
-## 24.3.1-next.1
+## 24.3.2-next.1
 
 ### Patch Changes
 
 - Updated dependencies [[`1df64d2`](https://github.com/LedgerHQ/ledger-live/commit/1df64d27e75c2a3445903ebce9e1f681683676da)]:
   - @ledgerhq/hw-transport-node-hid@6.29.1-next.0
 
-## 24.3.1-next.0
+## 24.3.2-next.0
 
 ### Patch Changes
 
@@ -46,6 +46,20 @@
   - @ledgerhq/coin-bitcoin@0.6.1-next.0
   - @ledgerhq/live-countervalues@0.2.1-next.0
 
+## 24.3.1
+
+### Patch Changes
+
+- Updated dependencies [[`b0c7b8d`](https://github.com/LedgerHQ/ledger-live/commit/b0c7b8dcc7088853ad73518cb470e8b5b05be4de)]:
+  - @ledgerhq/live-common@34.4.0
+
+## 24.3.1-hotfix.0
+
+### Patch Changes
+
+- Updated dependencies [[`b0c7b8d`](https://github.com/LedgerHQ/ledger-live/commit/b0c7b8dcc7088853ad73518cb470e8b5b05be4de)]:
+  - @ledgerhq/live-common@34.4.0-hotfix.0
+
 ## 24.3.0
 
 ### Minor Changes

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

diff --git a/apps/ledger-live-desktop/CHANGELOG.md b/apps/ledger-live-desktop/CHANGELOG.md
@@ -100,6 +100,20 @@
   - @ledgerhq/[email protected]
   - @ledgerhq/[email protected]
 
+## 2.82.1
+
+### Patch Changes
+
+- Updated dependencies [[`b0c7b8d`](https://github.com/LedgerHQ/ledger-live/commit/b0c7b8dcc7088853ad73518cb470e8b5b05be4de)]:
+  - @ledgerhq/[email protected]
+
+## 2.82.1-hotfix.0
+
+### Patch Changes
+
+- Updated dependencies [[`b0c7b8d`](https://github.com/LedgerHQ/ledger-live/commit/b0c7b8dcc7088853ad73518cb470e8b5b05be4de)]:
+  - @ledgerhq/[email protected]
+
 ## 2.82.0
 
 ### Minor Changes

diff --git a/apps/ledger-live-mobile/CHANGELOG.md b/apps/ledger-live-mobile/CHANGELOG.md
@@ -66,6 +66,28 @@
   - @ledgerhq/[email protected]
   - @ledgerhq/[email protected]
 
+## 3.45.1
+
+### Patch Changes
+
+- [#7153](https://github.com/LedgerHQ/ledger-live/pull/7153) [`33d26a9`](https://github.com/LedgerHQ/ledger-live/commit/33d26a9847d15571cce19f8159e29958398bb3a0) Thanks [@live-github-bot](https://github.com/apps/live-github-bot)! - bugfix crash case in ReceiveFunds/02-SelectAccount
+
+- Updated dependencies [[`b0c7b8d`](https://github.com/LedgerHQ/ledger-live/commit/b0c7b8dcc7088853ad73518cb470e8b5b05be4de)]:
+  - @ledgerhq/[email protected]
+
+## 3.45.1-hotfix.1
+
+### Patch Changes
+
+- [#7153](https://github.com/LedgerHQ/ledger-live/pull/7153) [`33d26a9`](https://github.com/LedgerHQ/ledger-live/commit/33d26a9847d15571cce19f8159e29958398bb3a0) Thanks [@live-github-bot](https://github.com/apps/live-github-bot)! - bugfix crash case in ReceiveFunds/02-SelectAccount
+
+## 3.45.1-hotfix.0
+
+### Patch Changes
+
+- Updated dependencies [[`b0c7b8d`](https://github.com/LedgerHQ/ledger-live/commit/b0c7b8dcc7088853ad73518cb470e8b5b05be4de)]:
+  - @ledgerhq/[email protected]
+
 ## 3.45.0
 
 ### Minor Changes

diff --git a/apps/ledger-live-mobile/src/screens/ReceiveFunds/02-SelectAccount.tsx b/apps/ledger-live-mobile/src/screens/ReceiveFunds/02-SelectAccount.tsx
@@ -4,7 +4,7 @@ import { useSelector } from "react-redux";
 
 import { Button, Flex, Text } from "@ledgerhq/native-ui";
 import { useTranslation } from "react-i18next";
-import { Account, AccountLike, SubAccount, TokenAccount } from "@ledgerhq/types-live";
+import { Account, SubAccount, TokenAccount } from "@ledgerhq/types-live";
 import { makeEmptyTokenAccount } from "@ledgerhq/live-common/account/index";
 import { flattenAccountsByCryptoCurrencyScreenSelector } from "~/reducers/accounts";
 import { NavigatorName, ScreenName } from "~/const";
@@ -25,6 +25,8 @@ type SubAccountEnhanced = SubAccount & {
   triggerCreateAccount: boolean;
 };
 
+type AccountLikeEnhanced = SubAccountEnhanced | Account | TokenAccount;
+
 type NavigationProps = BaseComposite<
   StackNavigatorProps<AccountsNavigatorParamList, ScreenName.ReceiveSelectAccount>
 >;
@@ -54,21 +56,22 @@ function ReceiveSelectAccount({
   const aggregatedAccounts = useMemo(
     () =>
       currency && currency.type === "TokenCurrency"
-        ? parentAccounts!.reduce<AccountLike[]>((accs, pa) => {
-            const tokenAccounts = (pa as Account).subAccounts
-              ? (pa as Account).subAccounts?.filter(
-                  acc => acc.type === "TokenAccount" && acc.token.id === currency.id,
-                )
-              : [];
+        ? parentAccounts!.reduce<AccountLikeEnhanced[]>((accs, pa) => {
+            const tokenAccounts =
+              pa.type === "Account" && pa.subAccounts
+                ? pa.subAccounts?.filter(
+                    acc => acc.type === "TokenAccount" && acc.token.id === currency.id,
+                  )
+                : [];
 
             if (tokenAccounts && tokenAccounts.length > 0) {
               accs.push(...tokenAccounts);
-            } else {
-              const tokenAcc = makeEmptyTokenAccount(pa as Account, currency);
+            } else if (pa.type === "Account") {
+              const tokenAcc = makeEmptyTokenAccount(pa, currency);
 
               const tokenA: SubAccountEnhanced = {
                 ...tokenAcc,
-                parentAccount: pa as Account,
+                parentAccount: pa,
                 triggerCreateAccount: true,
               };
 
@@ -82,16 +85,16 @@ function ReceiveSelectAccount({
   );
 
   const selectAccount = useCallback(
-    (account: AccountLike) => {
+    (account: AccountLikeEnhanced) => {
       if (currency) {
         track("account_clicked", {
           asset: currency.name,
           page: "Select account to deposit to",
         });
         navigation.navigate(ScreenName.ReceiveConfirmation, {
           ...route.params,
-          accountId: (account as SubAccountEnhanced)?.parentId || account.id,
-          createTokenAccount: (account as SubAccountEnhanced)?.triggerCreateAccount,
+          accountId: (account.type !== "Account" && account?.parentId) || account.id,
+          createTokenAccount: "triggerCreateAccount" in account && account?.triggerCreateAccount,
         });
       }
     },
@@ -101,21 +104,12 @@ function ReceiveSelectAccount({
   const walletState = useSelector(walletSelector);
 
   const renderItem = useCallback(
-    ({ item }: ListRenderItemInfo<AccountLike>) => (
+    ({ item }: ListRenderItemInfo<AccountLikeEnhanced>) => (
       <Flex px={6}>
         <AccountCard
           account={item}
           AccountSubTitle={
-            (item as SubAccountEnhanced).parentAccount ||
-            (item as TokenAccount).token?.parentCurrency ? (
-              <Text color="neutral.c80">
-                {accountNameWithDefaultSelector(
-                  walletState,
-                  ((item as SubAccountEnhanced).parentAccount as Account) ||
-                    (item as TokenAccount).token.parentCurrency,
-                )}
-              </Text>
-            ) : null
+            <Text color="neutral.c80">{accountNameWithDefaultSelector(walletState, item)}</Text>
           }
           onPress={() => selectAccount(item)}
         />
@@ -144,7 +138,7 @@ function ReceiveSelectAccount({
     }
   }, [currency, navigationAccount]);
 
-  const keyExtractor = useCallback((item: AccountLike) => item?.id, []);
+  const keyExtractor = useCallback((item: AccountLikeEnhanced) => item?.id, []);
 
   return currency && aggregatedAccounts && aggregatedAccounts.length > 0 ? (
     <>

diff --git a/apps/web-tools/CHANGELOG.md b/apps/web-tools/CHANGELOG.md
@@ -1,6 +1,6 @@
 # web-tools
 
-## 0.6.1-next.3
+## 0.6.2-next.3
 
 ### Patch Changes
 
@@ -11,21 +11,21 @@
   - @ledgerhq/[email protected]
   - @ledgerhq/[email protected]
 
-## 0.6.1-next.2
+## 0.6.2-next.2
 
 ### Patch Changes
 
 - Updated dependencies []:
   - @ledgerhq/[email protected]
 
-## 0.6.1-next.1
+## 0.6.2-next.1
 
 ### Patch Changes
 
 - Updated dependencies []:
   - @ledgerhq/[email protected]
 
-## 0.6.1-next.0
+## 0.6.2-next.0
 
 ### Patch Changes
 
@@ -39,6 +39,20 @@
   - @ledgerhq/[email protected]
   - @ledgerhq/[email protected]
 
+## 0.6.1
+
+### Patch Changes
+
+- Updated dependencies [[`b0c7b8d`](https://github.com/LedgerHQ/ledger-live/commit/b0c7b8dcc7088853ad73518cb470e8b5b05be4de)]:
+  - @ledgerhq/[email protected]
+
+## 0.6.1-hotfix.0
+
+### Patch Changes
+
+- Updated dependencies [[`b0c7b8d`](https://github.com/LedgerHQ/ledger-live/commit/b0c7b8dcc7088853ad73518cb470e8b5b05be4de)]:
+  - @ledgerhq/[email protected]
+
 ## 0.6.0
 
 ### Minor Changes

diff --git a/apps/web-tools/package.json b/apps/web-tools/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ledgerhq/web-tools",
-  "version": "0.6.1-next.3",
+  "version": "0.6.2-next.3",
   "private": true,
   "browser": {
     "fs": false,

diff --git a/libs/coin-modules/coin-polkadot/CHANGELOG.md b/libs/coin-modules/coin-polkadot/CHANGELOG.md
@@ -24,6 +24,18 @@
   - @ledgerhq/[email protected]
   - @ledgerhq/[email protected]
 
+## 0.8.0
+
+### Minor Changes
+
+- [#7153](https://github.com/LedgerHQ/ledger-live/pull/7153) [`b0c7b8d`](https://github.com/LedgerHQ/ledger-live/commit/b0c7b8dcc7088853ad73518cb470e8b5b05be4de) Thanks [@live-github-bot](https://github.com/apps/live-github-bot)! - polkadot generic nano app support
+
+## 0.8.0-hotfix.0
+
+### Minor Changes
+
+- [#7153](https://github.com/LedgerHQ/ledger-live/pull/7153) [`b0c7b8d`](https://github.com/LedgerHQ/ledger-live/commit/b0c7b8dcc7088853ad73518cb470e8b5b05be4de) Thanks [@live-github-bot](https://github.com/apps/live-github-bot)! - polkadot generic nano app support
+
 ## 0.7.0
 
 ### Minor Changes