boldsuck/haveno
1
0
Fork 0
mirror of https://github.com/boldsuck/haveno.git synced 2025-01-03 14:49:25 +00:00
Code Issues 1 Projects Releases Packages Wiki Activity Actions

disable payment sent/received buttons until acked

Browse source
This commit is contained in:
woodser 2024-04-21 15:14:15 -04:00
parent 3a66c9cd24
commit 6455171dea
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/src/main/java/haveno/core/trade/Trade.java
View file

@ -1033,10 +1033,10 @@ public abstract class Trade implements Tradable, Model {
checkAndVerifyDaemonConnection(); checkAndVerifyDaemonConnection();
// check multisig import // check multisig import
if (getWallet().isMultisigImportNeeded()) throw new RuntimeException("Cannot create payout tx because multisig import is needed"); MoneroWallet multisigWallet = getWallet();
if (multisigWallet.isMultisigImportNeeded()) throw new RuntimeException("Cannot create payout tx because multisig import is needed");
// gather info // gather info
MoneroWallet multisigWallet = getWallet();
String sellerPayoutAddress = this.getSeller().getPayoutAddressString(); String sellerPayoutAddress = this.getSeller().getPayoutAddressString();
String buyerPayoutAddress = this.getBuyer().getPayoutAddressString(); String buyerPayoutAddress = this.getBuyer().getPayoutAddressString();
Preconditions.checkNotNull(sellerPayoutAddress, "Seller payout address must not be null"); Preconditions.checkNotNull(sellerPayoutAddress, "Seller payout address must not be null");

4
desktop/src/main/java/haveno/desktop/main/portfolio/pendingtrades/steps/buyer/BuyerStep2View.java
View file

@ -442,8 +442,8 @@ public class BuyerStep2View extends TradeStepView {
private boolean confirmPaymentSentPermitted() { private boolean confirmPaymentSentPermitted() {
if (!trade.confirmPermitted()) return false; if (!trade.confirmPermitted()) return false;
if (trade.getState() == Trade.State.BUYER_STORED_IN_MAILBOX_PAYMENT_SENT_MSG) return false; if (trade.getState() == Trade.State.BUYER_SEND_FAILED_PAYMENT_SENT_MSG) return true;
return trade.isDepositsUnlocked() && trade.getState().ordinal() < Trade.State.SELLER_RECEIVED_PAYMENT_SENT_MSG.ordinal(); return trade.isDepositsUnlocked() && trade.getState().ordinal() < Trade.State.BUYER_CONFIRMED_PAYMENT_SENT.ordinal();
} }
/////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////

4
desktop/src/main/java/haveno/desktop/main/portfolio/pendingtrades/steps/seller/SellerStep3View.java
View file

@ -289,8 +289,8 @@ public class SellerStep3View extends TradeStepView {
private boolean confirmPaymentReceivedPermitted() { private boolean confirmPaymentReceivedPermitted() {
if (!trade.confirmPermitted()) return false; if (!trade.confirmPermitted()) return false;
if (trade.getState() == Trade.State.SELLER_STORED_IN_MAILBOX_PAYMENT_RECEIVED_MSG) return false; if (trade.getState() == Trade.State.SELLER_SEND_FAILED_PAYMENT_RECEIVED_MSG) return true;
return trade.getState().ordinal() >= Trade.State.BUYER_SENT_PAYMENT_SENT_MSG.ordinal() && trade.getState().ordinal() <= Trade.State.SELLER_SENT_PAYMENT_RECEIVED_MSG.ordinal(); return trade.getState().ordinal() >= Trade.State.BUYER_SENT_PAYMENT_SENT_MSG.ordinal() && trade.getState().ordinal() < Trade.State.SELLER_CONFIRMED_PAYMENT_RECEIPT.ordinal();
} }
/////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////