fix: only route to error when asset is bitcoin, closes #4083

leather-io · Aug 3, 2023 · 099f96d · 099f96d
1 parent 7fbb65a
commit 099f96d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/src/app/pages/send/choose-crypto-asset/components/crypto-asset-list-item.tsx b/src/app/pages/send/choose-crypto-asset/components/crypto-asset-list-item.tsx
@@ -23,7 +23,7 @@ export function CryptoAssetListItem(props: CryptoAssetListItemProps) {
   const isBitcoinSendEnabled = useConfigBitcoinSendEnabled();
 
   function navigateToSendForm({ isFtToken = false }: { isFtToken: boolean }) {
-    if (!isBitcoinSendEnabled) {
+    if (asset.symbol === 'BTC' && !isBitcoinSendEnabled) {
       return navigate(RouteUrls.SendBtcDisabled);
     }
     const symbol = asset.symbol === '' ? asset.contractAssetName : asset.symbol.toLowerCase();

diff --git a/src/app/query/common/remote-config/remote-config.query.ts b/src/app/query/common/remote-config/remote-config.query.ts
@@ -115,7 +115,7 @@ export function useConfigBitcoinEnabled() {
   const config = useRemoteConfig();
   const hasBitcoinAccount = useHasCurrentBitcoinAccount();
   return whenWallet({
-    ledger: config?.bitcoinEnabled && LEDGER_BITCOIN_ENABLED && hasBitcoinAccount,
+    ledger: (config?.bitcoinEnabled ?? true) && LEDGER_BITCOIN_ENABLED && hasBitcoinAccount,
     software: config?.bitcoinEnabled ?? true,
   });
 }
@@ -125,7 +125,7 @@ export function useConfigBitcoinSendEnabled() {
   const config = useRemoteConfig();
   const hasBitcoinAccount = useHasCurrentBitcoinAccount();
   return whenWallet({
-    ledger: config?.bitcoinEnabled && hasBitcoinAccount,
+    ledger: config?.bitcoinSendEnabled && hasBitcoinAccount,
     software: config?.bitcoinSendEnabled ?? true,
   });
 }

diff --git a/tests/specs/ledger/ledger.spec.ts b/tests/specs/ledger/ledger.spec.ts
@@ -19,5 +19,6 @@ test.describe('App with Ledger', () => {
     const noActivityText = homePage.page.getByText('No activity yet');
     // Account has activity to make sure we don't see label
     await test.expect(noActivityText).not.toBeVisible();
+    test.expect(homePage.page.url()).toContain('/activity');
   });
 });