Skip to content

fix: 6853 follow-up #6869

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
merged 4 commits into from
Oct 4, 2025
Merged

fix: 6853 follow-up #6869

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
01f74a2
fix: close "review transaction" span tag
UdjinM6 Oct 1, 2025
5205b61
fix: wrap the whole text in a global span to control its styling prop…
UdjinM6 Oct 1, 2025
732ef96
fix: typo: B in PSBT is Blockchain in our codebase
UdjinM6 Oct 1, 2025
2f27744
fix: typo: add missing whitespace
UdjinM6 Oct 1, 2025
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
13 changes: 10 additions & 3 deletions src/qt/sendcoinsdialog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,6 +362,9 @@ bool SendCoinsDialog::send(const QList<SendCoinsRecipient>& recipients, QString&
formatted_short.erase(formatted_short.begin() + MAX_SEND_POPUP_ENTRIES, formatted_short.end());
}

// Wrap the whole text in a global span to control its styling properly
question_string.append("<span style='font-weight:normal;'>");

/*: Message displayed when attempting to create a transaction. Cautionary text to prompt the user to verify
that the displayed transaction details represent the transaction the user intends to create. */
question_string.append(tr("Do you want to create this transaction?"));
Expand All @@ -373,16 +376,17 @@ bool SendCoinsDialog::send(const QList<SendCoinsRecipient>& recipients, QString&
/*: Text to inform a user attempting to create a transaction of their current options. At this stage,
a user can only create a PSBT. This string is displayed when private keys are disabled and an external
signer is not available. */
question_string.append(tr("Please, review your transaction proposal. This will produce a Partially Signed Bitcoin Transaction (PSBT) which you can save or copy and then sign with e.g. an offline %1 wallet, or a PSBT-compatible hardware wallet.").arg(PACKAGE_NAME));
question_string.append(tr("Please, review your transaction proposal. This will produce a Partially Signed Blockchain Transaction (PSBT) which you can save or copy and then sign with e.g. an offline %1 wallet, or a PSBT-compatible hardware wallet.").arg(PACKAGE_NAME));
} else if (model->getOptionsModel()->getEnablePSBTControls()) {
/*: Text to inform a user attempting to create a transaction of their current options. At this stage,
a user can send their transaction or create a PSBT. This string is displayed when both private keys
and PSBT controls are enabled. */
question_string.append(tr("Please, review your transaction. You can create and send this transaction or create a Partially Signed Bitcoin Transaction (PSBT), which you can save or copy and then sign with, e.g., an offline %1 wallet, or a PSBT-compatible hardware wallet.").arg(PACKAGE_NAME));
question_string.append(tr("Please, review your transaction. You can create and send this transaction or create a Partially Signed Blockchain Transaction (PSBT), which you can save or copy and then sign with, e.g., an offline %1 wallet, or a PSBT-compatible hardware wallet.").arg(PACKAGE_NAME));
} else {
/*: Text to prompt a user to review the details of the transaction they are attempting to send. */
question_string.append(tr("Please, review your transaction."));
}
question_string.append("</span>");
question_string.append("<br /><br />");
question_string.append(formatted_short.join("<br />"));
question_string.append("<br />");
Expand Down Expand Up @@ -440,7 +444,7 @@ bool SendCoinsDialog::send(const QList<SendCoinsRecipient>& recipients, QString&
question_string.append("<br />");
question_string.append("<span style='" + GUIUtil::getThemedStyleQString(GUIUtil::ThemedStyle::TS_WARNING) + "'>");
question_string.append(tr("Warning: Using %1 with %2 or more inputs can harm your privacy and is not recommended").arg(strCoinJoinName).arg(10));
question_string.append("<a style='" + GUIUtil::getThemedStyleQString(GUIUtil::ThemedStyle::TS_COMMAND) + "' href=\"https://docs.dash.org/en/stable/wallets/dashcore/coinjoin-instantsend.html#inputs\">");
question_string.append(" <a style='" + GUIUtil::getThemedStyleQString(GUIUtil::ThemedStyle::TS_COMMAND) + "' href=\"https://docs.dash.org/en/stable/wallets/dashcore/coinjoin-instantsend.html#inputs\">");
question_string.append(tr("Click to learn more"));
question_string.append("</a>");
question_string.append("</span> ");
Expand All @@ -462,6 +466,9 @@ bool SendCoinsDialog::send(const QList<SendCoinsRecipient>& recipients, QString&
question_string.append(QString("<br /><span style='font-size:10pt; font-weight:normal;'>(=%1)</span>")
.arg(alternativeUnits.join(" " + tr("or") + " ")));

// Close the global span we opened at the very beginning
question_string.append("</span>");

if (formatted.size() > 1) {
informative_text = tr("To review recipient list click \"Show Details…\"");
detailed_text = formatted.join("\n\n");
Expand Down
Loading