Add signature to dispute result and various other improvements

core/src/main/resources/i18n/displayStrings.properties

@@ -894,6 +894,12 @@ portfolio.pending.mediationResult.popup.info=The mediator has suggested the foll
   (or if the other peer is unresponsive).\n\n\
   More details about the new arbitration model:\n\
   https://docs.bisq.network/trading-rules.html#arbitration
+portfolio.pending.mediationResult.popup.selfAccepted.lockTimeOver=You have accepted the mediator''s suggested payout \
+  but it seems that your trading peer has not accepted it.\n\n\
+  The lock time is since {0} (block {1}) over and you can open a second-round dispute with an arbitrator who will \
+  investigate the case again and do a payout based on their findings.\n\n\
+  You can find more details about the arbitration model at:\n\
+  https://docs.bisq.network/trading-rules.html#arbitration
 portfolio.pending.mediationResult.popup.openArbitration=Reject and request arbitration
 portfolio.pending.mediationResult.popup.alreadyAccepted=You've already accepted
 

desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/steps/TradeStepView.java

@@ -30,6 +30,7 @@
 import bisq.core.locale.Res;
 import bisq.core.support.dispute.Dispute;
 import bisq.core.support.dispute.DisputeResult;
+import bisq.core.support.dispute.mediation.MediationResultState;
 import bisq.core.trade.Contract;
 import bisq.core.trade.Trade;
 import bisq.core.user.Preferences;
@@ -41,6 +42,9 @@
 import bisq.common.UserThread;
 import bisq.common.util.Tuple3;
 
+import org.bitcoinj.core.Transaction;
+import org.bitcoinj.core.listeners.NewBestBlockListener;
+
 import de.jensd.fx.fontawesome.AwesomeDude;
 import de.jensd.fx.fontawesome.AwesomeIcon;
 
@@ -62,6 +66,7 @@
 import org.fxmisc.easybind.EasyBind;
 import org.fxmisc.easybind.Subscription;
 
+import javafx.beans.property.BooleanProperty;
 import javafx.beans.value.ChangeListener;
 
 import java.util.Optional;
@@ -97,6 +102,8 @@ public abstract class TradeStepView extends AnchorPane {
     private Popup acceptMediationResultPopup;
     private BootstrapListener bootstrapListener;
     private TradeSubView.ChatCallback chatCallback;
+    private final NewBestBlockListener newBestBlockListener;
+    private ChangeListener<Boolean> pendingTradesInitializedListener;
 
 
     ///////////////////////////////////////////////////////////////////////////////////////////
@@ -158,6 +165,10 @@ public void onMinuteTick() {
                 updateTimeLeft();
             }
         };
+
+        newBestBlockListener = block -> {
+            checkIfLockTimeIsOver();
+        };
     }
 
     public void activate() {
@@ -200,14 +211,34 @@ public void onUpdatedDataReceived() {
         }
 
         tradePeriodStateSubscription = EasyBind.subscribe(trade.tradePeriodStateProperty(), newValue -> {
-            if (newValue != null)
+            if (newValue != null) {
                 updateTradePeriodState(newValue);
+            }
         });
 
         model.clockWatcher.addListener(clockListener);
 
-        if (infoLabel != null)
+        if (infoLabel != null) {
             infoLabel.setText(getInfoText());
+        }
+
+        BooleanProperty pendingTradesInitialized = model.dataModel.tradeManager.getPendingTradesInitialized();
+        if (pendingTradesInitialized.get()) {
+            onPendingTradesInitialized();
+        } else {
+            pendingTradesInitializedListener = (observable, oldValue, newValue) -> {
+                if (newValue) {
+                    onPendingTradesInitialized();
+                    UserThread.execute(() -> pendingTradesInitialized.removeListener(pendingTradesInitializedListener));
+                }
+            };
+            pendingTradesInitialized.addListener(pendingTradesInitializedListener);
+        }
+    }
+
+    protected void onPendingTradesInitialized() {
+        model.dataModel.btcWalletService.addNewBestBlockListener(newBestBlockListener);
+        checkIfLockTimeIsOver();
     }
 
     private void registerSubscriptions() {
@@ -262,6 +293,15 @@ public void deactivate() {
 
         if (tradeStepInfo != null)
             tradeStepInfo.setOnAction(null);
+
+        if (newBestBlockListener != null) {
+            model.dataModel.btcWalletService.removeNewBestBlockListener(newBestBlockListener);
+        }
+
+        if (acceptMediationResultPopup != null) {
+            acceptMediationResultPopup.hide();
+            acceptMediationResultPopup = null;
+        }
     }
 
     ///////////////////////////////////////////////////////////////////////////////////////////
@@ -445,6 +485,11 @@ private void updateDisputeState(Trade.DisputeState disputeState) {
                         tradeStepInfo.setState(TradeStepInfo.State.IN_REFUND_REQUEST_SELF_REQUESTED);
                 });
 
+                if (acceptMediationResultPopup != null) {
+                    acceptMediationResultPopup.hide();
+                    acceptMediationResultPopup = null;
+                }
+
                 break;
             case REFUND_REQUEST_STARTED_BY_PEER:
                 if (tradeStepInfo != null) {
@@ -457,6 +502,11 @@ private void updateDisputeState(Trade.DisputeState disputeState) {
                     if (tradeStepInfo != null)
                         tradeStepInfo.setState(TradeStepInfo.State.IN_REFUND_REQUEST_PEER_REQUESTED);
                 });
+
+                if (acceptMediationResultPopup != null) {
+                    acceptMediationResultPopup.hide();
+                    acceptMediationResultPopup = null;
+                }
                 break;
             case REFUND_REQUEST_CLOSED:
                 break;
@@ -563,13 +613,34 @@ private void openMediationResultPopup(String headLine) {
         String actionButtonText = hasSelfAccepted() ?
                 Res.get("portfolio.pending.mediationResult.popup.alreadyAccepted") : Res.get("shared.accept");
 
-        acceptMediationResultPopup = new Popup().width(900)
-                .headLine(headLine)
-                .instruction(Res.get("portfolio.pending.mediationResult.popup.info",
+        String message;
+        MediationResultState mediationResultState = checkNotNull(trade).getMediationResultState();
+        if (mediationResultState == null) {
+            return;
+        }
+
+        switch (mediationResultState) {
+            case MEDIATION_RESULT_ACCEPTED:
+            case SIG_MSG_SENT:
+            case SIG_MSG_ARRIVED:
+            case SIG_MSG_IN_MAILBOX:
+            case SIG_MSG_SEND_FAILED:
+                message = Res.get("portfolio.pending.mediationResult.popup.selfAccepted.lockTimeOver",
+                        FormattingUtils.getDateFromBlockHeight(remaining),
+                        lockTime);
+                break;
+            default:
+                message = Res.get("portfolio.pending.mediationResult.popup.info",
                         myPayoutAmount,
                         peersPayoutAmount,
                         FormattingUtils.getDateFromBlockHeight(remaining),
-                        lockTime))
+                        lockTime);
+                break;
+        }
+
+        acceptMediationResultPopup = new Popup().width(900)
+                .headLine(headLine)
+                .instruction(message)
                 .actionButtonText(actionButtonText)
                 .onAction(() -> {
                     model.dataModel.mediationManager.acceptMediationResult(trade,
@@ -656,6 +727,18 @@ protected boolean isDisputed() {
         return trade.getDisputeState() != Trade.DisputeState.NO_DISPUTE;
     }
 
+    private void checkIfLockTimeIsOver() {
+        Transaction delayedPayoutTx = trade.getDelayedPayoutTx();
+        if (delayedPayoutTx != null) {
+            long lockTime = delayedPayoutTx.getLockTime();
+            int bestChainHeight = model.dataModel.btcWalletService.getBestChainHeight();
+            long remaining = lockTime - bestChainHeight;
+            if (remaining <= 0) {
+                openMediationResultPopup(Res.get("portfolio.pending.mediationResult.popup.headline", trade.getShortId()));
+            }
+        }
+    }
+
 
     ///////////////////////////////////////////////////////////////////////////////////////////
     // TradeDurationLimitInfo

desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/steps/buyer/BuyerStep1View.java

@@ -24,13 +24,7 @@
 import bisq.core.locale.Res;
 import bisq.core.trade.TradeDataValidation;
 
-import bisq.common.UserThread;
-
-import javafx.beans.property.BooleanProperty;
-import javafx.beans.value.ChangeListener;
-
 public class BuyerStep1View extends TradeStepView {
-    private ChangeListener<Boolean> pendingTradesInitializedListener;
 
     ///////////////////////////////////////////////////////////////////////////////////////////
     // Constructor, Initialisation
@@ -41,22 +35,9 @@ public BuyerStep1View(PendingTradesViewModel model) {
     }
 
     @Override
-    public void activate() {
-        super.activate();
-
-        // We need to have the trades initialized before we can call validatePayoutTx.
-        BooleanProperty pendingTradesInitialized = model.dataModel.tradeManager.getPendingTradesInitialized();
-        if (pendingTradesInitialized.get()) {
-            validatePayoutTx();
-        } else {
-            pendingTradesInitializedListener = (observable, oldValue, newValue) -> {
-                if (newValue) {
-                    validatePayoutTx();
-                    UserThread.execute(() -> pendingTradesInitialized.removeListener(pendingTradesInitializedListener));
-                }
-            };
-            pendingTradesInitialized.addListener(pendingTradesInitializedListener);
-        }
+    protected void onPendingTradesInitialized() {
+        super.onPendingTradesInitialized();
+        validatePayoutTx();
     }
 
 

desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/steps/buyer/BuyerStep2View.java

@@ -88,9 +88,6 @@
 import org.fxmisc.easybind.EasyBind;
 import org.fxmisc.easybind.Subscription;
 
-import javafx.beans.property.BooleanProperty;
-import javafx.beans.value.ChangeListener;
-
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
@@ -107,7 +104,6 @@ public class BuyerStep2View extends TradeStepView {
     private BusyAnimation busyAnimation;
     private Subscription tradeStatePropertySubscription;
     private Timer timeoutTimer;
-    private ChangeListener<Boolean> pendingTradesInitializedListener;
 
     ///////////////////////////////////////////////////////////////////////////////////////////
     // Constructor, Initialisation
@@ -121,20 +117,6 @@ public BuyerStep2View(PendingTradesViewModel model) {
     public void activate() {
         super.activate();
 
-        // We need to have the trades initialized before we can call validatePayoutTx.
-        BooleanProperty pendingTradesInitialized = model.dataModel.tradeManager.getPendingTradesInitialized();
-        if (pendingTradesInitialized.get()) {
-            validatePayoutTx();
-        } else {
-            pendingTradesInitializedListener = (observable, oldValue, newValue) -> {
-                if (newValue) {
-                    validatePayoutTx();
-                    UserThread.execute(() -> pendingTradesInitialized.removeListener(pendingTradesInitializedListener));
-                }
-            };
-            pendingTradesInitialized.addListener(pendingTradesInitializedListener);
-        }
-
         if (timeoutTimer != null)
             timeoutTimer.stop();
 
@@ -212,6 +194,13 @@ public void deactivate() {
         }
     }
 
+    @Override
+    protected void onPendingTradesInitialized() {
+        super.onPendingTradesInitialized();
+        validatePayoutTx();
+    }
+
+
     ///////////////////////////////////////////////////////////////////////////////////////////
     // Content
     ///////////////////////////////////////////////////////////////////////////////////////////