Merge pull request #4921 from chimp1984/add-move-to-failed-trades-but…

…ton-if-deposit-tx-is-missing Detect missing deposit tx to allow moving to failed trades
bisq-network · Dec 9, 2020 · d65e0b5 · d65e0b5
2 parents a340a83 + ce68f2e
commit d65e0b5
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/core/src/main/java/bisq/core/trade/Trade.java b/core/src/main/java/bisq/core/trade/Trade.java
@@ -1030,6 +1030,7 @@ public boolean isTxChainInvalid() {
         return offer.getOfferFeePaymentTxId() == null ||
                 getTakerFeeTxId() == null ||
                 getDepositTxId() == null ||
+                getDepositTx() == null ||
                 getDelayedPayoutTxBytes() == null;
     }
 

diff --git a/desktop/src/main/java/bisq/desktop/main/overlays/windows/TradeDetailsWindow.java b/desktop/src/main/java/bisq/desktop/main/overlays/windows/TradeDetailsWindow.java
@@ -19,6 +19,7 @@
 
 import bisq.desktop.components.BisqTextArea;
 import bisq.desktop.components.TextFieldWithCopyIcon;
+import bisq.desktop.components.TxIdTextField;
 import bisq.desktop.main.MainView;
 import bisq.desktop.main.overlays.Overlay;
 import bisq.desktop.util.DisplayUtils;
@@ -285,9 +286,17 @@ private void addContent() {
         addLabelTxIdTextField(gridPane, ++rowIndex, Res.get("shared.makerFeeTxId"), offer.getOfferFeePaymentTxId());
         addLabelTxIdTextField(gridPane, ++rowIndex, Res.get("shared.takerFeeTxId"), trade.getTakerFeeTxId());
 
+        String depositTxId = trade.getDepositTxId();
         Transaction depositTx = trade.getDepositTx();
-        String depositTxString = depositTx != null ? depositTx.getTxId().toString() : null;
-        addLabelTxIdTextField(gridPane, ++rowIndex, Res.get("shared.depositTransactionId"), depositTxString);
+        String depositTxIdFromTx = depositTx != null ? depositTx.getTxId().toString() : null;
+        TxIdTextField depositTxIdTextField = addLabelTxIdTextField(gridPane, ++rowIndex,
+                Res.get("shared.depositTransactionId"), depositTxId).second;
+        if (depositTxId == null || !depositTxId.equals(depositTxIdFromTx)) {
+            depositTxIdTextField.getTextField().setId("address-text-field-error");
+            log.error("trade.getDepositTxId() and trade.getDepositTx().getTxId().toString() are not the same. " +
+                            "trade.getDepositTxId()={}, trade.getDepositTx().getTxId().toString()={}, depositTx={}",
+                    depositTxId, depositTxIdFromTx, depositTx);
+        }
 
         Transaction delayedPayoutTx = trade.getDelayedPayoutTx(btcWalletService);
         String delayedPayoutTxString = delayedPayoutTx != null ? delayedPayoutTx.getTxId().toString() : null;