mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2024-11-19 18:03:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix race condition in sent confirmation popup

Browse Source
This commit is contained in:
jmacxx 2021-03-19 10:24:53 -05:00
parent 53f42c4885
commit f4407187c6
No known key found for this signature in database
GPG Key ID: 155297BABFE94A1B
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
desktop/src/main/java/bisq/desktop/main/funds/withdrawal/WithdrawalView.java
View File

@ -38,6 +38,7 @@ import bisq.core.btc.setup.WalletsSetup;
import bisq.core.btc.wallet.BtcWalletService;
import bisq.core.btc.wallet.Restrictions;
import bisq.core.locale.Res;
import bisq.core.offer.OpenOffer;
import bisq.core.trade.Trade;
import bisq.core.trade.TradeManager;
import bisq.core.user.DontShowAgainLookup;
@ -141,7 +142,6 @@ public class WithdrawalView extends ActivatableView<VBox, Void> {
private Set<String> fromAddresses = new HashSet<>();
private Coin totalAvailableAmountOfSelectedItems = Coin.ZERO;
private Coin amountAsCoin = Coin.ZERO;
private Coin sendersAmount = Coin.ZERO;
private ChangeListener<String> amountListener;
private ChangeListener<Boolean> amountFocusListener;
private ChangeListener<Toggle> feeToggleGroupListener, inputsToggleGroupListener;
@ -327,11 +327,13 @@ public class WithdrawalView extends ActivatableView<VBox, Void> {
private void onWithdraw() {
if (GUIUtil.isReadyForTxBroadcastOrShowPopup(p2PService, walletsSetup)) {
try {
final String withdrawToAddress = withdrawToTextField.getText();
final Coin sendersAmount;
// We do not know sendersAmount if senderPaysFee is true. We repeat fee calculation after first attempt if senderPaysFee is true.
Transaction feeEstimationTransaction = btcWalletService.getFeeEstimationTransactionForMultipleAddresses(fromAddresses, amountAsCoin);
if (feeExcluded && feeEstimationTransaction != null) {
sendersAmount = amountAsCoin.add(feeEstimationTransaction.getFee());
feeEstimationTransaction = btcWalletService.getFeeEstimationTransactionForMultipleAddresses(fromAddresses, sendersAmount);
feeEstimationTransaction = btcWalletService.getFeeEstimationTransactionForMultipleAddresses(fromAddresses, amountAsCoin.add(feeEstimationTransaction.getFee()));
}
checkNotNull(feeEstimationTransaction, "feeEstimationTransaction must not be null");
@ -356,7 +358,7 @@ public class WithdrawalView extends ActivatableView<VBox, Void> {
fee.value);
}
if (areInputsValid()) {
if (areInputsValid(sendersAmount)) {
int txVsize = feeEstimationTransaction.getVsize();
log.info("Fee for tx with size {}: {} " + Res.getBaseCurrencyCode() + "", txVsize, fee.toPlainString());
@ -367,7 +369,7 @@ public class WithdrawalView extends ActivatableView<VBox, Void> {
String messageText = Res.get("shared.sendFundsDetailsWithFee",
formatter.formatCoinWithCode(sendersAmount),
withdrawFromTextField.getText(),
withdrawToTextField.getText(),
withdrawToAddress,
formatter.formatCoinWithCode(fee),
feePerVbyte,
vkb,
@ -387,7 +389,7 @@ public class WithdrawalView extends ActivatableView<VBox, Void> {
if (transaction != null) {
String key = "showTransactionSent";
if (DontShowAgainLookup.showAgain(key)) {
new TxDetails(transaction.getTxId().toString(), withdrawToTextField.getText(), formatter.formatCoinWithCode(sendersAmount))
new TxDetails(transaction.getTxId().toString(), withdrawToAddress, formatter.formatCoinWithCode(sendersAmount))
.dontShowAgainId(key)
.show();
}
@ -540,7 +542,6 @@ public class WithdrawalView extends ActivatableView<VBox, Void> {
totalAvailableAmountOfSelectedItems = Coin.ZERO;
amountAsCoin = Coin.ZERO;
sendersAmount = Coin.ZERO;
amountTextField.setText("");
amountTextField.setPromptText(Res.get("funds.withdrawal.setAmount"));
@ -554,7 +555,7 @@ public class WithdrawalView extends ActivatableView<VBox, Void> {
tableView.getSelectionModel().clearSelection();
}
private boolean areInputsValid() {
private boolean areInputsValid(Coin sendersAmount) {
if (!sendersAmount.isPositive()) {
new Popup().warning(Res.get("validation.negative")).show();
return false;