Skip to content

fix(gui): always show lock-tx description on BitcoinLockTxInMempoolPage #1141

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
binarybaron merged 1 commit into from
Jun 25, 2026
Merged

fix(gui): always show lock-tx description on BitcoinLockTxInMempoolPage #1141

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 2 additions & 16 deletions src-gui/src/renderer/components/pages/swap/swap/in_progress/BitcoinLockTxInMempoolPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,6 @@ import { formatConfirmations } from "utils/formatUtils";
import BitcoinTransactionInfoBox from "renderer/components/pages/swap/swap/components/BitcoinTransactionInfoBox";
import { Box, DialogContentText } from "@mui/material";

// This is the number of blocks after which we consider the swap to be at risk of being unsuccessful
const BITCOIN_CONFIRMATIONS_WARNING_THRESHOLD = 2;

export default function BitcoinLockTxInMempoolPage({
btc_lock_confirmations,
btc_lock_txid,
Expand All @@ -20,10 +17,7 @@ export default function BitcoinLockTxInMempoolPage({

return (
<>
{(btc_lock_confirmations === undefined ||
btc_lock_confirmations < BITCOIN_CONFIRMATIONS_WARNING_THRESHOLD) && (
<DialogContentText>{description()}</DialogContentText>
)}
<DialogContentText>{description()}</DialogContentText>
<Box
style={{
display: "flex",
Expand All @@ -35,15 +29,7 @@ export default function BitcoinLockTxInMempoolPage({
title="Bitcoin Lock Transaction"
txId={btc_lock_txid}
loading
additionalContent={
<>
Most makers require one confirmation before locking their Monero.
After they lock their funds and the Monero transaction receives
one confirmation, the swap will proceed to the next step.
<br />
Confirmations: {formatConfirmations(btc_lock_confirmations)}
</>
}
additionalContent={<>{formatConfirmations(btc_lock_confirmations)}</>}
/>
</Box>
</>
Expand Down
Loading