From f13e1ec610a248cf435bc5d33ce18de8dee611eb Mon Sep 17 00:00:00 2001
From: woodser <woodser@protonmail.com>
Date: Mon, 19 Dec 2022 11:18:50 +0000
Subject: [PATCH] cannot open dispute until both deposits confirmed and
 available

---
 .../resources/i18n/displayStrings.properties     | 16 ++++++++--------
 .../pendingtrades/steps/TradeStepView.java       |  8 ++++++--
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/core/src/main/resources/i18n/displayStrings.properties b/core/src/main/resources/i18n/displayStrings.properties
index 86ac0e3c..f2f300a4 100644
--- a/core/src/main/resources/i18n/displayStrings.properties
+++ b/core/src/main/resources/i18n/displayStrings.properties
@@ -645,7 +645,7 @@ portfolio.pending.autoConf.state.FAILED=A service returned with a failure. No au
 portfolio.pending.step1.info=Deposit transaction has been published.\n{0} need to wait for 10 confirmations (about 20 minutes) before the payment can start.
 portfolio.pending.step1.warn=The deposit transaction is not confirmed yet. This usually takes about 20 minutes, but could be more if the network is congested.
 portfolio.pending.step1.openForDispute=The deposit transaction is still not confirmed. \
-  If you have been waiting for much longer than 20 minutes, contact an arbitrator for assistance.
+  If you have been waiting for much longer than 20 minutes, contact Haveno support.
 
 # suppress inspection "TrailingSpacesInProperty"
 portfolio.pending.step2.confReached=Your trade has reached 10 confirmations.\n\n
@@ -689,7 +689,7 @@ portfolio.pending.step2_buyer.sellersAddress=Seller''s {0} address
 portfolio.pending.step2_buyer.buyerAccount=Your payment account to be used
 portfolio.pending.step2_buyer.paymentStarted=Payment started
 portfolio.pending.step2_buyer.warn=You still have not done your {0} payment!\nPlease note that the trade has to be completed by {1}.
-portfolio.pending.step2_buyer.openForDispute=You have not completed your payment yet\nThe max. period for the trade has elapsed, but you can still complete the payment.\
+portfolio.pending.step2_buyer.openForDispute=You have not completed your payment yet\nThe max. period for the trade has elapsed, but you can still complete the payment.\n\
   Contact an arbitrator if you need assistance.
 portfolio.pending.step2_buyer.paperReceipt.headline=Did you send the paper receipt to the XMR seller?
 portfolio.pending.step2_buyer.paperReceipt.msg=Remember:\n\
@@ -866,16 +866,16 @@ portfolio.pending.openSupportTicket.msg=Please use this function only in emergen
   handled by an arbitrator.
 
 portfolio.pending.timeLockNotOver=You have to wait until ≈{0} ({1} more blocks) before you can open an arbitration dispute.
-portfolio.pending.error.depositTxNull=The deposit transaction is null. You cannot open a dispute \
-  without a valid deposit transaction. Please go to \"Settings/Network info\" and do a SPV resync.\n\n\
-  For further help please contact the Haveno support channel at the Haveno Keybase team.
+portfolio.pending.error.depositTxNull=A deposit transaction is null. You cannot open a dispute \
+  with an invalid deposit transaction.\n\n\
+  For further help, please contact Haveno support in our Matrix chatroom.
 portfolio.pending.mediationResult.error.depositTxNull=The deposit transaction is null. You can move the \
   trade to failed trades.
 portfolio.pending.mediationResult.error.delayedPayoutTxNull=The delayed payout transaction is null. You can move the \
   trade to failed trades.
-portfolio.pending.error.depositTxNotConfirmed=The deposit transaction is not confirmed. You can not open an arbitration dispute \
-  with an unconfirmed deposit transaction. Please wait until it is confirmed or go to \"Settings/Network info\" and do a SPV resync.\n\n\
-  For further help please contact the Haveno support channel at the Haveno Keybase team.
+portfolio.pending.error.depositTxNotConfirmed=The deposit transactions are not confirmed and available. You cannot open an arbitration dispute \
+  with a pending deposit transaction. Please wait until both deposit transasctions are confirmed and available.\n\n\
+  For further help, please contact Haveno support in our Matrix chatroom.
 
 portfolio.pending.support.headline.getHelp=Need help?
 portfolio.pending.support.button.getHelp=Open Trader Chat
diff --git a/desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/steps/TradeStepView.java b/desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/steps/TradeStepView.java
index d4a1c6ce..f311aacf 100644
--- a/desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/steps/TradeStepView.java
+++ b/desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/steps/TradeStepView.java
@@ -273,8 +273,12 @@ public abstract class TradeStepView extends AnchorPane {
     }
 
     private void openSupportTicket() {
-        applyOnDisputeOpened();
-        model.dataModel.onOpenDispute();
+        if (trade.getPhase().ordinal() < Trade.Phase.DEPOSITS_UNLOCKED.ordinal()) {
+            new Popup().warning(Res.get("portfolio.pending.error.depositTxNotConfirmed")).show();
+        } else {
+            applyOnDisputeOpened();
+            model.dataModel.onOpenDispute();
+        }
     }
 
     private void openChat() {