From 259b49303dddbd00d6d29be9d4a12d3f6dfc9a20 Mon Sep 17 00:00:00 2001
From: Polybius93 <adam.daniel.puskas@polybius-studios.com>
Date: Thu, 12 Oct 2023 16:09:36 +0200
Subject: [PATCH] fix: fixed typecheck errors

---
 src/app/features/asset-list/asset-list.tsx                  | 1 -
 src/app/query/bitcoin/ordinals/brc20/use-brc-20.ts          | 2 +-
 .../blockchain/bitcoin/native-segwit-account.hooks.ts       | 2 --
 .../accounts/blockchain/bitcoin/taproot-account.hooks.ts    | 2 --
 src/shared/crypto/bitcoin/bitcoin.utils.ts                  | 6 +++---
 5 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/src/app/features/asset-list/asset-list.tsx b/src/app/features/asset-list/asset-list.tsx
index 7b2d40340fa..8a63771f5b1 100644
--- a/src/app/features/asset-list/asset-list.tsx
+++ b/src/app/features/asset-list/asset-list.tsx
@@ -13,7 +13,6 @@ import { CryptoCurrencyAssetItem } from '@app/components/crypto-assets/crypto-cu
 import { BtcIcon } from '@app/components/icons/btc-icon';
 import { CurrentStacksAccountLoader } from '@app/components/stacks-account-loader';
 import { useCurrentAccountNativeSegwitAddressIndexZero } from '@app/store/accounts/blockchain/bitcoin/native-segwit-account.hooks';
-import { useCurrentNetwork } from '@app/store/networks/networks.selectors';
 
 import { Collectibles } from '../collectibles/collectibles';
 import { PendingBrc20TransferList } from '../pending-brc-20-transfers/pending-brc-20-transfers';
diff --git a/src/app/query/bitcoin/ordinals/brc20/use-brc-20.ts b/src/app/query/bitcoin/ordinals/brc20/use-brc-20.ts
index 2cd5dbea3a7..0add7a01da7 100644
--- a/src/app/query/bitcoin/ordinals/brc20/use-brc-20.ts
+++ b/src/app/query/bitcoin/ordinals/brc20/use-brc-20.ts
@@ -21,7 +21,7 @@ export function useBrc20FeatureFlag() {
 
   const supportedNetwork =
     currentNetwork.chain.bitcoin.bitcoinNetwork === 'mainnet' ||
-    currentNetwork.chain.bitcoin.bitcoinNetworketwork === 'signet';
+    currentNetwork.chain.bitcoin.bitcoinNetwork === 'signet';
 
   if (!supportedNetwork) return { enabled: false, reason: 'Unsupported network' } as const;
 
diff --git a/src/app/store/accounts/blockchain/bitcoin/native-segwit-account.hooks.ts b/src/app/store/accounts/blockchain/bitcoin/native-segwit-account.hooks.ts
index db6451041be..20636658f13 100644
--- a/src/app/store/accounts/blockchain/bitcoin/native-segwit-account.hooks.ts
+++ b/src/app/store/accounts/blockchain/bitcoin/native-segwit-account.hooks.ts
@@ -56,13 +56,11 @@ export function useNativeSegwitNetworkSigners() {
   const {
     mainnet: mainnetKeychain,
     testnet: testnetKeychain,
-    regtest: regtestKeychain,
   } = useSelector(selectNativeSegwitAccountBuilder);
 
   return useMakeBitcoinNetworkSignersForPaymentType(
     mainnetKeychain,
     testnetKeychain,
-    regtestKeychain,
     getNativeSegWitPaymentFromAddressIndex
   );
 }
diff --git a/src/app/store/accounts/blockchain/bitcoin/taproot-account.hooks.ts b/src/app/store/accounts/blockchain/bitcoin/taproot-account.hooks.ts
index 36612c18c82..4479452d4f4 100644
--- a/src/app/store/accounts/blockchain/bitcoin/taproot-account.hooks.ts
+++ b/src/app/store/accounts/blockchain/bitcoin/taproot-account.hooks.ts
@@ -56,12 +56,10 @@ export function useTaprootNetworkSigners() {
   const {
     mainnet: mainnetKeychain,
     testnet: testnetKeychain,
-    regtest: regtestKeychain,
   } = useSelector(selectTaprootAccountBuilder);
   return useMakeBitcoinNetworkSignersForPaymentType(
     mainnetKeychain,
     testnetKeychain,
-    regtestKeychain,
     getTaprootPaymentFromAddressIndex
   );
 }
diff --git a/src/shared/crypto/bitcoin/bitcoin.utils.ts b/src/shared/crypto/bitcoin/bitcoin.utils.ts
index d855aa7b5b2..dd6cfd9daaa 100644
--- a/src/shared/crypto/bitcoin/bitcoin.utils.ts
+++ b/src/shared/crypto/bitcoin/bitcoin.utils.ts
@@ -4,8 +4,8 @@ import { HDKey, Versions } from '@scure/bip32';
 import * as btc from '@scure/btc-signer';
 
 import { BitcoinNetworkModes, NetworkModes } from '@shared/constants';
-import { defaultWalletKeyId, whenNetwork } from '@shared/utils';
-
+import { defaultWalletKeyId } from '@shared/utils';
+import { whenBitcoinNetwork } from '@app/common/utils';
 import { DerivationPathDepth } from '../derivation-path.utils';
 import { BtcSignerNetwork } from './bitcoin.network';
 import { getTaprootPayment } from './p2tr-address-gen';
@@ -164,7 +164,7 @@ export function createWalletIdDecoratedPath(policy: string, walletId: string) {
 // Primarily used to get the correct `Version` when passing Ledger Bitcoin
 // extended public keys to the HDKey constructor
 export function getHdKeyVersionsFromNetwork(network: BitcoinNetworkModes) {
-  return whenNetwork(network)({
+  return whenBitcoinNetwork(network)({
     mainnet: undefined,
     testnet: {
       private: 0x00000000,