Skip to content

Commit 69b10d9

Browse files
Merge #6869: fix: 6853 follow-up
2f27744 fix: typo: add missing whitespace (UdjinM6) 732ef96 fix: typo: B in PSBT is Blockchain in our codebase (UdjinM6) 5205b61 fix: wrap the whole text in a global span to control its styling properly (UdjinM6) 01f74a2 fix: close "review transaction" span tag (UdjinM6) Pull request description: ## Issue being fixed or feature implemented b11d4e1 (#6853) broke styling in SendCoinsDialog (all text is smaller now). develop (using CJ tx as an example to make most of text visible) <img width="420" height="417" alt="Screenshot 2025-10-01 at 20 37 49" src="https://github.com/user-attachments/assets/9257708d-593b-465d-9237-a834989c52e5" /> before b11d4e1 (#6853) <img width="419" height="440" alt="Screenshot 2025-10-01 at 20 25 55" src="https://github.com/user-attachments/assets/b53fb34c-e0d7-4b2e-8c2f-bf95a25a16cc" /> ## What was done? Fixed styling and also fixed some typos while at it. It looks like this now. <img width="418" height="456" alt="Screenshot 2025-10-01 at 23 48 55" src="https://github.com/user-attachments/assets/16282519-a3c3-424e-adab-25b29a4d28a3" /> ## How Has This Been Tested? Run dash-qt and try sending regular and CJ txes to one/many recipients. ## Breaking Changes n/a ## Checklist: - [ ] I have performed a self-review of my own code - [ ] I have commented my code, particularly in hard-to-understand areas - [ ] I have added or updated relevant unit/integration/functional/e2e tests - [ ] I have made corresponding changes to the documentation - [ ] I have assigned this pull request to a milestone _(for repository code-owners and collaborators only)_ ACKs for top commit: knst: utACK 2f27744 kwvg: utACK 2f27744 Tree-SHA512: 8642f80c6abd6850514fdec9f85bf38dc9e5ec903ad6c70827779a274e50d0f88288706087d560d6141f799c8891c18c3b57ff4dc80fa6898c6da7246b0f0b60
2 parents a13a602 + 2f27744 commit 69b10d9

File tree

1 file changed

+10
-3
lines changed

1 file changed

+10
-3
lines changed

src/qt/sendcoinsdialog.cpp

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -362,6 +362,9 @@ bool SendCoinsDialog::send(const QList<SendCoinsRecipient>& recipients, QString&
362362
formatted_short.erase(formatted_short.begin() + MAX_SEND_POPUP_ENTRIES, formatted_short.end());
363363
}
364364

365+
// Wrap the whole text in a global span to control its styling properly
366+
question_string.append("<span style='font-weight:normal;'>");
367+
365368
/*: Message displayed when attempting to create a transaction. Cautionary text to prompt the user to verify
366369
that the displayed transaction details represent the transaction the user intends to create. */
367370
question_string.append(tr("Do you want to create this transaction?"));
@@ -373,16 +376,17 @@ bool SendCoinsDialog::send(const QList<SendCoinsRecipient>& recipients, QString&
373376
/*: Text to inform a user attempting to create a transaction of their current options. At this stage,
374377
a user can only create a PSBT. This string is displayed when private keys are disabled and an external
375378
signer is not available. */
376-
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));
379+
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));
377380
} else if (model->getOptionsModel()->getEnablePSBTControls()) {
378381
/*: Text to inform a user attempting to create a transaction of their current options. At this stage,
379382
a user can send their transaction or create a PSBT. This string is displayed when both private keys
380383
and PSBT controls are enabled. */
381-
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));
384+
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));
382385
} else {
383386
/*: Text to prompt a user to review the details of the transaction they are attempting to send. */
384387
question_string.append(tr("Please, review your transaction."));
385388
}
389+
question_string.append("</span>");
386390
question_string.append("<br /><br />");
387391
question_string.append(formatted_short.join("<br />"));
388392
question_string.append("<br />");
@@ -440,7 +444,7 @@ bool SendCoinsDialog::send(const QList<SendCoinsRecipient>& recipients, QString&
440444
question_string.append("<br />");
441445
question_string.append("<span style='" + GUIUtil::getThemedStyleQString(GUIUtil::ThemedStyle::TS_WARNING) + "'>");
442446
question_string.append(tr("Warning: Using %1 with %2 or more inputs can harm your privacy and is not recommended").arg(strCoinJoinName).arg(10));
443-
question_string.append("<a style='" + GUIUtil::getThemedStyleQString(GUIUtil::ThemedStyle::TS_COMMAND) + "' href=\"https://docs.dash.org/en/stable/wallets/dashcore/coinjoin-instantsend.html#inputs\">");
447+
question_string.append(" <a style='" + GUIUtil::getThemedStyleQString(GUIUtil::ThemedStyle::TS_COMMAND) + "' href=\"https://docs.dash.org/en/stable/wallets/dashcore/coinjoin-instantsend.html#inputs\">");
444448
question_string.append(tr("Click to learn more"));
445449
question_string.append("</a>");
446450
question_string.append("</span> ");
@@ -462,6 +466,9 @@ bool SendCoinsDialog::send(const QList<SendCoinsRecipient>& recipients, QString&
462466
question_string.append(QString("<br /><span style='font-size:10pt; font-weight:normal;'>(=%1)</span>")
463467
.arg(alternativeUnits.join(" " + tr("or") + " ")));
464468

469+
// Close the global span we opened at the very beginning
470+
question_string.append("</span>");
471+
465472
if (formatted.size() > 1) {
466473
informative_text = tr("To review recipient list click \"Show Details…\"");
467474
detailed_text = formatted.join("\n\n");

0 commit comments

Comments
 (0)