diff --git a/apps/mobile/src/features/approver/components/outcomes-card.tsx b/apps/mobile/src/features/approver/components/bitcoin-outcome.tsx similarity index 53% rename from apps/mobile/src/features/approver/components/outcomes-card.tsx rename to apps/mobile/src/features/approver/components/bitcoin-outcome.tsx index 279e60953..58d417fec 100644 --- a/apps/mobile/src/features/approver/components/outcomes-card.tsx +++ b/apps/mobile/src/features/approver/components/bitcoin-outcome.tsx @@ -3,24 +3,9 @@ import { useBtcMarketDataQuery } from '@/queries/market-data/btc-market-data.que import { t } from '@lingui/macro'; import { Money } from '@leather.io/models'; -import { AddressDisplayer, Avatar, Flag, Text, UsersTwoIcon } from '@leather.io/ui/native'; +import { Text } from '@leather.io/ui/native'; import { baseCurrencyAmountInQuote, createMoney } from '@leather.io/utils'; -function BitcoinAddress({ address }: { address: string }) { - return ( - - - - } - > - - - ); -} - export function BitcoinOutcome({ amount }: { amount: Money }) { const { data: btcMarketData } = useBtcMarketDataQuery(); @@ -40,19 +25,3 @@ export function BitcoinOutcome({ amount }: { amount: Money }) { ); } - -export function OutcomeAddressesCard({ addresses }: { addresses: string[] }) { - return ( - <> - - {t({ - id: 'approver.outcomes.title2', - message: 'To address', - })} - - {addresses.map(address => ( - - ))} - - ); -} diff --git a/apps/mobile/src/features/approver/components/fee-card.tsx b/apps/mobile/src/features/approver/components/fee-card.tsx index da75274ae..3dba9dc78 100644 --- a/apps/mobile/src/features/approver/components/fee-card.tsx +++ b/apps/mobile/src/features/approver/components/fee-card.tsx @@ -21,7 +21,12 @@ import { } from '@leather.io/ui/native'; import { baseCurrencyAmountInQuote, createMoney, match } from '@leather.io/utils'; -export function FeeCard({ feeType, amount }: { feeType: FeeTypes; amount: Money }) { +interface FeeCardProps { + feeType: FeeTypes; + amount: Money; +} + +export function FeeCard({ feeType, amount }: FeeCardProps) { const matchFeeType = match(); const feeIcon = matchFeeType(feeType, { [FeeTypes.Low]: , diff --git a/apps/mobile/src/features/approver/components/outcome-addresses-card.tsx b/apps/mobile/src/features/approver/components/outcome-addresses-card.tsx new file mode 100644 index 000000000..9c37ad941 --- /dev/null +++ b/apps/mobile/src/features/approver/components/outcome-addresses-card.tsx @@ -0,0 +1,33 @@ +import { t } from '@lingui/macro'; + +import { AddressDisplayer, Avatar, Flag, Text, UsersTwoIcon } from '@leather.io/ui/native'; + +function BitcoinAddress({ address }: { address: string }) { + return ( + + + + } + > + + + ); +} +export function OutcomeAddressesCard({ addresses }: { addresses: string[] }) { + return ( + <> + + {t({ + id: 'approver.outcomes.title2', + message: 'To address', + })} + + {addresses.map(address => ( + + ))} + + ); +} diff --git a/apps/mobile/src/features/psbt-signer/psbt-signer.tsx b/apps/mobile/src/features/psbt-signer/psbt-signer.tsx index 3553191d3..f30be96d5 100644 --- a/apps/mobile/src/features/psbt-signer/psbt-signer.tsx +++ b/apps/mobile/src/features/psbt-signer/psbt-signer.tsx @@ -2,9 +2,10 @@ import { useMemo, useState } from 'react'; import { formatBalance } from '@/components/balance/balance'; import { ApproverAccountCard } from '@/features/approver/components/approver-account-card'; +import { BitcoinOutcome } from '@/features/approver/components/bitcoin-outcome'; import { FeeCard } from '@/features/approver/components/fee-card'; import { InputsAndOutputsCard } from '@/features/approver/components/inputs-outputs-card'; -import { BitcoinOutcome, OutcomeAddressesCard } from '@/features/approver/components/outcomes-card'; +import { OutcomeAddressesCard } from '@/features/approver/components/outcome-addresses-card'; import { useBtcMarketDataQuery } from '@/queries/market-data/btc-market-data.query'; import { t } from '@lingui/macro'; @@ -27,7 +28,7 @@ interface PsbtSignerProps { } export function PsbtSigner({ psbtHex, onEdit, onSuccess }: PsbtSignerProps) { - const net = useCurrentNetworkState(); + const network = useCurrentNetworkState(); const psbtAccounts = usePsbtAccounts({ psbtHex }); const psbtPayers = usePsbtPayers({ psbtHex }); const psbtAddresses = psbtPayers.map(payer => payer.address); @@ -41,9 +42,9 @@ export function PsbtSigner({ psbtHex, onEdit, onSuccess }: PsbtSignerProps) { getPsbtDetails({ psbtHex, psbtAddresses, - networkMode: net.chain.bitcoin.mode, + networkMode: network.chain.bitcoin.mode, }), - [psbtHex, net, psbtAddresses] + [psbtHex, network, psbtAddresses] ); const totalBtc = sumMoney([ psbtDetails.addressNativeSegwitTotal, diff --git a/apps/mobile/src/features/send/send-form/components/send-form-asset.tsx b/apps/mobile/src/features/send/send-form/components/send-form-asset.tsx index 67b13cd4d..e2026a5ab 100644 --- a/apps/mobile/src/features/send/send-form/components/send-form-asset.tsx +++ b/apps/mobile/src/features/send/send-form/components/send-form-asset.tsx @@ -25,6 +25,8 @@ export function SendFormAsset>({ icon={icon} ticker={symbol} tokenName={name} + px="3" + py="3" />