From eb8aa0fc85f77503373deb5b439f2db20cbcc300 Mon Sep 17 00:00:00 2001
From: Manfred Karrer <mk@nucleo.io>
Date: Fri, 3 Jun 2016 12:07:22 +0200
Subject: [PATCH] Handle case of taker fee paid and no error, rename
 isDepositFeePaid to isDepositPaid

---
 core/src/main/java/io/bitsquare/trade/Trade.java        | 2 +-
 core/src/main/java/io/bitsquare/trade/TradeManager.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/io/bitsquare/trade/Trade.java b/core/src/main/java/io/bitsquare/trade/Trade.java
index fd301466b9..a3f7b53ab1 100644
--- a/core/src/main/java/io/bitsquare/trade/Trade.java
+++ b/core/src/main/java/io/bitsquare/trade/Trade.java
@@ -338,7 +338,7 @@ public abstract class Trade implements Tradable, Model {
         return state.getPhase() != null && state.getPhase().ordinal() >= Phase.TAKER_FEE_PAID.ordinal();
     }
 
-    public boolean isDepositFeePaid() {
+    public boolean isDepositPaid() {
         return state.getPhase() != null && state.getPhase().ordinal() >= Phase.DEPOSIT_PAID.ordinal();
     }
 
diff --git a/core/src/main/java/io/bitsquare/trade/TradeManager.java b/core/src/main/java/io/bitsquare/trade/TradeManager.java
index 88ae4e4d11..52fa963f09 100644
--- a/core/src/main/java/io/bitsquare/trade/TradeManager.java
+++ b/core/src/main/java/io/bitsquare/trade/TradeManager.java
@@ -179,7 +179,7 @@ public class TradeManager {
         List<Trade> toRemove = new ArrayList<>();
         for (Trade trade : trades) {
             trade.setStorage(tradableListStorage);
-            if (trade.isDepositFeePaid()) {
+            if (trade.isDepositPaid() || (trade.isTakerFeePaid() && trade.errorMessageProperty().get() == null)) {
                 initTrade(trade, trade.getProcessModel().getUseSavingsWallet(), trade.getProcessModel().getFundsNeededForTrade());
                 trade.updateDepositTxFromWallet();
             } else if (trade.isTakerFeePaid()) {