Merge pull request #4885 from chimp1984/fix-bug-with-reapplying-past-…

…trade-state Avoid that buyer switches back to trade step 2 at startup after payment confirmed
bisq-network · Dec 4, 2020 · 588623e · 588623e
2 parents c44eaa8 + f843b54
commit 588623e
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/.../bisq/core/trade/protocol/tasks/buyer/BuyerSendCounterCurrencyTransferStartedMessage.java b/.../bisq/core/trade/protocol/tasks/buyer/BuyerSendCounterCurrencyTransferStartedMessage.java
@@ -82,7 +82,9 @@ protected TradeMessage getMessage(String tradeId) {
 
     @Override
     protected void setStateSent() {
-        trade.setStateIfValidTransitionTo(Trade.State.BUYER_SENT_FIAT_PAYMENT_INITIATED_MSG);
+        if (trade.getState().ordinal() < Trade.State.BUYER_SENT_FIAT_PAYMENT_INITIATED_MSG.ordinal()) {
+            trade.setStateIfValidTransitionTo(Trade.State.BUYER_SENT_FIAT_PAYMENT_INITIATED_MSG);
+        }
 
         processModel.getTradeManager().requestPersistence();
     }