Merge 205cffaf38 into merged_master (Bitcoin PR #17226)

This commit is contained in:
Andrew Poelstra 2020-11-09 21:20:44 +00:00
commit 79f0419cae

View file

@ -17,9 +17,6 @@
<bool>false</bool>
</property>
<widget class="QFrame" name="SendCoins">
<property name="toolTip">
<string>The amount to send in the selected unit</string>
</property>
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
</property>
@ -165,7 +162,11 @@
<item row="2" column="1">
<layout class="QHBoxLayout" name="horizontalLayoutAmount" stretch="0,1,0">
<item>
<widget class="BitcoinAmountField" name="payAmount"/>
<widget class="BitcoinAmountField" name="payAmount">
<property name="toolTip">
<string>The amount to send in the selected unit</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="checkboxSubtractFeeFromAmount">