fix bch address convert issue (#1847)

LedgerHQ · Apr 8, 2022 · 6b17a19 · 6b17a19
1 parent d78a214
commit 6b17a19
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/src/families/bitcoin/logic.ts b/src/families/bitcoin/logic.ts
@@ -1,5 +1,4 @@
 import cashaddr from "cashaddrjs";
-import bchaddr from "bchaddrjs";
 import { Currency, isValidAddress } from "./wallet-btc";
 import { RecipientRequired, InvalidAddress } from "@ledgerhq/errors";
 import type { Account, CryptoCurrency, CryptoCurrencyIds } from "./../../types";
@@ -143,8 +142,8 @@ type CoinLogic = {
   injectGetAddressParams?: (arg0: Account) => any;
 };
 
-const bchToCashaddrAddressWithoutPrefix = (recipient) =>
-  recipient ? bchaddr.toCashAddress(recipient).split(":")[1] : recipient;
+export const bchToCashaddrAddressWithoutPrefix = (recipient) =>
+  recipient ? recipient.substring(recipient.indexOf(":") + 1) : recipient;
 
 export const perCoinLogic: Record<
   CryptoCurrencyIds,

diff --git a/src/families/bitcoin/specs.ts b/src/families/bitcoin/specs.ts
@@ -257,7 +257,9 @@ const bitcoinLikeMutations = ({
     test: ({ account }) => {
       expect(
         account.bitcoinResources?.utxos
-          .filter((u) => u.blockHeight && u.blockHeight < account.blockHeight) // Exclude pending UTXOs and the Utxos just written into new block
+          .filter(
+            (u) => u.blockHeight && u.blockHeight < account.blockHeight - 10
+          ) // Exclude pending UTXOs and the Utxos just written into new block (10 blocks time)
           .reduce((p, c) => p.plus(c.value), new BigNumber(0))
           .toString()
       ).toBe("0");