diff --git a/src/app/components/crypto-assets/bitcoin/brc20-token-asset-list/brc20-token-asset-list.tsx b/src/app/components/crypto-assets/bitcoin/brc20-token-asset-list/brc20-token-asset-list.tsx index 23a447028ec..1dd6b2ad996 100644 --- a/src/app/components/crypto-assets/bitcoin/brc20-token-asset-list/brc20-token-asset-list.tsx +++ b/src/app/components/crypto-assets/bitcoin/brc20-token-asset-list/brc20-token-asset-list.tsx @@ -34,7 +34,6 @@ export function Brc20TokenAssetList(props: { brc20Tokens?: Brc20Token[] }) { {props.brc20Tokens?.map(token => ( navigateToBrc20SendForm(token) : noop} /> diff --git a/src/app/components/crypto-assets/bitcoin/brc20-token-asset-list/components/brc20-token-asset-item.layout.tsx b/src/app/components/crypto-assets/bitcoin/brc20-token-asset-list/components/brc20-token-asset-item.layout.tsx index 597bdd7ac26..594349afc90 100644 --- a/src/app/components/crypto-assets/bitcoin/brc20-token-asset-list/components/brc20-token-asset-item.layout.tsx +++ b/src/app/components/crypto-assets/bitcoin/brc20-token-asset-list/components/brc20-token-asset-item.layout.tsx @@ -12,41 +12,33 @@ import { Pressable } from '@app/ui/pressable/pressable'; interface Brc20TokenAssetItemLayoutProps { token: Brc20Token; onClick?(): void; - displayNotEnoughBalance?: boolean; } export function Brc20TokenAssetItemLayout({ onClick, - displayNotEnoughBalance, + token, }: Brc20TokenAssetItemLayoutProps) { const balance = createMoney(Number(token.overall_balance), token.ticker, 0); const formattedBalance = formatBalance(balance.amount.toString()); return ( - - - } - titleLeft={token.ticker} - captionLeft="BRC-20" - titleRight={ - - - {formattedBalance.value} - - - } - /> - - + + } + titleLeft={token.ticker} + captionLeft="BRC-20" + titleRight={ + + + {formattedBalance.value} + + + } + /> + ); } diff --git a/src/app/components/crypto-assets/choose-crypto-asset/crypto-asset-list.tsx b/src/app/components/crypto-assets/choose-crypto-asset/crypto-asset-list.tsx index 4692d5b9b85..df157015680 100644 --- a/src/app/components/crypto-assets/choose-crypto-asset/crypto-asset-list.tsx +++ b/src/app/components/crypto-assets/choose-crypto-asset/crypto-asset-list.tsx @@ -17,8 +17,13 @@ import { CryptoAssetListItem } from './crypto-asset-list-item'; interface CryptoAssetListProps { cryptoAssetBalances: AllTransferableCryptoAssetBalances[]; onItemClick(cryptoAssetBalance: AllTransferableCryptoAssetBalances): void; + variant: 'send' | 'fund'; } -export function CryptoAssetList({ cryptoAssetBalances, onItemClick }: CryptoAssetListProps) { +export function CryptoAssetList({ + cryptoAssetBalances, + onItemClick, + variant, +}: CryptoAssetListProps) { const { whenWallet } = useWalletType(); return ( @@ -46,18 +51,19 @@ export function CryptoAssetList({ cryptoAssetBalances, onItemClick }: CryptoAsse } /> ))} - {whenWallet({ - software: ( - - {() => ( - - {brc20Tokens => } - - )} - - ), - ledger: null, - })} + {variant === 'send' && + whenWallet({ + software: ( + + {() => ( + + {brc20Tokens => } + + )} + + ), + ledger: null, + })} ); } diff --git a/src/app/pages/fund/choose-asset-to-fund/choose-asset-to-fund.tsx b/src/app/pages/fund/choose-asset-to-fund/choose-asset-to-fund.tsx index 315850a8c61..6010708f8f1 100644 --- a/src/app/pages/fund/choose-asset-to-fund/choose-asset-to-fund.tsx +++ b/src/app/pages/fund/choose-asset-to-fund/choose-asset-to-fund.tsx @@ -33,7 +33,7 @@ export function ChooseCryptoAssetToFund() { [stxCryptoCurrencyAssetBalance, checkBlockchainAvailable, whenWallet] ); - const navigateToSendForm = useCallback( + const navigateToFund = useCallback( (cryptoAssetBalance: AllTransferableCryptoAssetBalances) => { const { asset } = cryptoAssetBalance; @@ -55,8 +55,9 @@ export function ChooseCryptoAssetToFund() { > diff --git a/src/app/pages/send/choose-crypto-asset/choose-crypto-asset.tsx b/src/app/pages/send/choose-crypto-asset/choose-crypto-asset.tsx index 06f0d638508..1bfa523827f 100644 --- a/src/app/pages/send/choose-crypto-asset/choose-crypto-asset.tsx +++ b/src/app/pages/send/choose-crypto-asset/choose-crypto-asset.tsx @@ -59,6 +59,7 @@ export function ChooseCryptoAsset() { software: true, }) )} + variant="send" />