boldsuck/haveno
1
0
Fork 0
mirror of https://github.com/boldsuck/haveno.git synced 2024-12-22 20:19:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

preserve withdraw fields when page reactivated while in progress

Browse source
This commit is contained in:
woodser 2024-08-20 08:30:48 -04:00 committed by GitHub
parent e18d281ca9
commit caebd58303
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
desktop/src/main/java/haveno/desktop/main/funds/withdrawal/WithdrawalView.java
View file

@ -242,8 +242,12 @@ public class WithdrawalView extends ActivatableView<VBox, Void> {
if (GUIUtil.isReadyForTxBroadcastOrShowPopup(xmrWalletService)) { if (GUIUtil.isReadyForTxBroadcastOrShowPopup(xmrWalletService)) {
try { try {
// collect tx fields to local variables
String withdrawToAddress = withdrawToTextField.getText();
boolean sendMax = this.sendMax;
BigInteger amount = this.amount;
// validate address // validate address
final String withdrawToAddress = withdrawToTextField.getText();
if (!MoneroUtils.isValidAddress(withdrawToAddress, XmrWalletService.getMoneroNetworkType())) { if (!MoneroUtils.isValidAddress(withdrawToAddress, XmrWalletService.getMoneroNetworkType())) {
throw new IllegalArgumentException(Res.get("validation.xmr.invalidAddress")); throw new IllegalArgumentException(Res.get("validation.xmr.invalidAddress"));
} }
@ -298,7 +302,7 @@ public class WithdrawalView extends ActivatableView<VBox, Void> {
BigInteger receiverAmount = tx.getOutgoingTransfer().getDestinations().get(0).getAmount(); BigInteger receiverAmount = tx.getOutgoingTransfer().getDestinations().get(0).getAmount();
BigInteger fee = tx.getFee(); BigInteger fee = tx.getFee();
String messageText = Res.get("shared.sendFundsDetailsWithFee", String messageText = Res.get("shared.sendFundsDetailsWithFee",
HavenoUtils.formatXmr(amount, true), HavenoUtils.formatXmr(receiverAmount.add(fee), true),
withdrawToAddress, withdrawToAddress,
HavenoUtils.formatXmr(fee, true), HavenoUtils.formatXmr(fee, true),
HavenoUtils.formatXmr(receiverAmount, true)); HavenoUtils.formatXmr(receiverAmount, true));