diff --git a/src/qt/sendcoinsdialog.cpp b/src/qt/sendcoinsdialog.cpp --- a/src/qt/sendcoinsdialog.cpp +++ b/src/qt/sendcoinsdialog.cpp @@ -300,49 +300,57 @@ address.append(""); QString recipientElement; + recipientElement = "
"; // normal payment if (!rcp.paymentRequest.IsInitialized()) { if (rcp.label.length() > 0) { // label with address - recipientElement = - tr("%1 to %2").arg(amount, GUIUtil::HtmlEscape(rcp.label)); + recipientElement.append( + tr("%1 to %2").arg(amount, GUIUtil::HtmlEscape(rcp.label))); recipientElement.append(QString(" (%1)").arg(address)); } else { // just address - recipientElement = tr("%1 to %2").arg(amount, address); + recipientElement.append(tr("%1 to %2").arg(amount, address)); } } else if (!rcp.authenticatedMerchant.isEmpty()) { // authenticated payment request - recipientElement = + recipientElement.append( tr("%1 to %2") .arg(amount, - GUIUtil::HtmlEscape(rcp.authenticatedMerchant)); + GUIUtil::HtmlEscape(rcp.authenticatedMerchant))); } else { // unauthenticated payment request - recipientElement = tr("%1 to %2").arg(amount, address); + recipientElement.append(tr("%1 to %2").arg(amount, address)); } formatted.append(recipientElement); } QString questionString = tr("Are you sure you want to send?"); - questionString.append("

%1"); + questionString.append("
"); + questionString.append(tr("Please, review your transaction.")); + questionString.append("
%1"); if (txFee > Amount::zero()) { // append fee string if a fee is required - questionString.append("
"); - questionString.append(BitcoinUnits::formatHtmlWithUnit( - model->getOptionsModel()->getDisplayUnit(), txFee)); - questionString.append(" "); - questionString.append(tr("added as transaction fee")); + questionString.append("
"); + questionString.append(tr("Transaction fee")); + questionString.append(""); // append transaction size questionString.append( " (" + QString::number((double)currentTransaction.getTransactionSize() / 1000) + - " kB)"); + " kB): "); + + // append transaction fee value + questionString.append( + ""); + questionString.append(BitcoinUnits::formatHtmlWithUnit( + model->getOptionsModel()->getDisplayUnit(), txFee)); + questionString.append("
"); } // add total amount in all subdivision units @@ -356,13 +364,14 @@ } } questionString.append( - tr("Total Amount %1") + QString("%1: %2") + .arg(tr("Total Amount")) .arg(BitcoinUnits::formatHtmlWithUnit( model->getOptionsModel()->getDisplayUnit(), totalAmount))); questionString.append( - QString("
(=%1)
") - .arg(alternativeUnits.join(" " + tr("or") + "
"))); + QString("
(=%1)") + .arg(alternativeUnits.join(" " + tr("or") + " "))); SendConfirmationDialog confirmationDialog( tr("Confirm send coins"), questionString.arg(formatted.join("
")),