fix(wallet-api): request account was not showing token accounts in so…

…me cases The issue was only visible on mobile but is also prevented on desktop now The issue was only reproducible when omitting the parent account currency from the currencyIds of the request account query
LedgerHQ · Sep 19, 2023 · 7cb2d03 · 7cb2d03
1 parent 4a57e0b
commit 7cb2d03
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 11 deletions.
diff --git a/.changeset/neat-insects-sin.md b/.changeset/neat-insects-sin.md
@@ -0,0 +1,9 @@
+---
+"ledger-live-desktop": patch
+"live-mobile": patch
+---
+
+fix(wallet-api): request account was not showing token accounts in some cases
+
+The issue was only visible on mobile but is also prevented on desktop now
+The issue was only reproducible when omitting the parent account currency from the currencyIds of the request account query
diff --git a/apps/ledger-live-desktop/src/renderer/components/PerCurrencySelectAccount/state.ts b/apps/ledger-live-desktop/src/renderer/components/PerCurrencySelectAccount/state.ts
@@ -14,11 +14,13 @@ export function getAccountTuplesForCurrency(
 ): AccountTuple[] {
   if (currency.type === "TokenCurrency") {
     return allAccounts
-      .filter(
-        account =>
-          account.currency.id === currency.parentCurrency.id &&
-          (accountIds ? accountIds.has(account.id) : true),
-      )
+      .filter(account => {
+        // not checking subAccounts against accountIds for TokenCurrency
+        // because the wallet-api is not able to setup empty accounts
+        // for all parentAccounts and currencies we support
+        // and we would lose the empty token accounts in the drawer
+        return account.currency.id === currency.parentCurrency.id;
+      })
       .map(account => ({
         account,
         subAccount:

diff --git a/.../ledger-live-desktop/src/renderer/drawers/DataSelector/SelectAccountAndCurrencyDrawer.tsx b/.../ledger-live-desktop/src/renderer/drawers/DataSelector/SelectAccountAndCurrencyDrawer.tsx
@@ -95,7 +95,13 @@ function SelectAccountAndCurrencyDrawer(props: SelectAccountAndCurrencyDrawerPro
     [onAccountSelected, props, onClose, accounts$],
   );
   if (currencies.length === 1) {
-    return <SelectAccountDrawer currency={currencies[0]} onAccountSelected={onAccountSelected} />;
+    return (
+      <SelectAccountDrawer
+        currency={currencies[0]}
+        onAccountSelected={onAccountSelected}
+        accounts$={accounts$}
+      />
+    );
   }
   return (
     <SelectAccountAndCurrencyDrawerContainer>

diff --git a/apps/ledger-live-mobile/src/reducers/accounts.ts b/apps/ledger-live-mobile/src/reducers/accounts.ts
@@ -184,11 +184,13 @@ export const accountsTuplesByCurrencySelector = createSelector(
   (accounts, currency, accountIds): { account: AccountLike; subAccount: SubAccount | null }[] => {
     if (currency.type === "TokenCurrency") {
       return accounts
-        .filter(
-          account =>
-            account.currency.id === currency.parentCurrency.id &&
-            (accountIds ? accountIds.has(account.id) : true),
-        )
+        .filter(account => {
+          // not checking subAccounts against accountIds for TokenCurrency
+          // because the wallet-api is not able to setup empty accounts
+          // for all parentAccounts and currencies we support
+          // and we would lose the empty token accounts in the select account
+          return account.currency.id === currency.parentCurrency.id;
+        })
         .map(account => ({
           account,
           subAccount: