Fixes scanAccounts to take tokenAccounts into account

LedgerHQ · Jun 21, 2019 · 3592706 · 3592706
1 parent 88e3839
commit 3592706
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/libcore/scanAccountsOnDevice.js b/src/libcore/scanAccountsOnDevice.js
@@ -12,7 +12,11 @@ import {
   isIterableDerivationMode,
   getMandatoryEmptyAccountSkip
 } from "../derivation";
-import { getWalletName, shouldShowNewAccount } from "../account";
+import {
+  getWalletName,
+  shouldShowNewAccount,
+  isAccountEmpty
+} from "../account";
 import type { Account, CryptoCurrency, DerivationMode } from "../types";
 import { open } from "../hw";
 import getAddress from "../hw/getAddress";
@@ -77,7 +81,7 @@ async function scanNextAccount(props: {
 
   if (isUnsubscribed()) return;
 
-  const isEmpty = account.operations.length === 0;
+  const isEmpty = isAccountEmpty(account);
   const shouldSkip =
     (isEmpty && !showNewAccount) ||
     !derivationModeSupportsIndex(derivationMode, accountIndex);