Merge #11556: [Qt] Improved copy for RBF checkbox and tooltip

db0b7373f [Qt] Improved copy: RBF checkbox, tooltip and confirmation screen (Sjors Provoost)

Pull request description:

  Fixes #11344 and replaces #11428.

  **Before**:
  <img width="588" alt="before" src="https://user-images.githubusercontent.com/10217/31984211-3299e81a-b993-11e7-94e9-bf63d2fed4bd.png">

  **After**:
  <img width="578" alt="after" src="https://user-images.githubusercontent.com/10217/31984404-11f839da-b994-11e7-86ad-4c17a7d44b86.png">

Tree-SHA512: 04876b2f2eab53c8d4fd4279e8384fd4869af7e15de7648b2689092f800b6ae9c890c01c26c2f7deffe79a1d70c6440d702cbe420e44fe3ded25c5b83d44ecfa
This commit is contained in:
Jonas Schnelli 2017-12-04 21:30:16 -10:00
commit 91eeaa0335
No known key found for this signature in database
GPG Key ID: 1EB776BB03C7922D
2 changed files with 3 additions and 3 deletions

View File

@ -1108,10 +1108,10 @@
<item> <item>
<widget class="QCheckBox" name="optInRBF"> <widget class="QCheckBox" name="optInRBF">
<property name="text"> <property name="text">
<string>Request Replace-By-Fee</string> <string>Allow increasing fee</string>
</property> </property>
<property name="toolTip"> <property name="toolTip">
<string>Indicates that the sender may wish to replace this transaction with a new one paying higher fees (prior to being confirmed).</string> <string>This allows you to increase the fee later if the transaction takes a long time to confirm. This will also cause the recommended fee to be lower. ("Replace-By-Fee", BIP 125)</string>
</property> </property>
</widget> </widget>
</item> </item>

View File

@ -345,7 +345,7 @@ void SendCoinsDialog::on_sendButton_clicked()
if (ui->optInRBF->isChecked()) if (ui->optInRBF->isChecked())
{ {
questionString.append("<hr /><span>"); questionString.append("<hr /><span>");
questionString.append(tr("This transaction signals replaceability (optin-RBF).")); questionString.append(tr("You can increase the fee later (signals Replace-By-Fee)."));
questionString.append("</span>"); questionString.append("</span>");
} }