Git-Mirrors/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2025-04-20 07:46:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

Handle case of taker fee paid and no error, rename isDepositFeePaid to isDepositPaid

Browse Source
This commit is contained in:
Manfred Karrer 2016-06-03 12:07:22 +02:00
parent b1a8cec3f8
commit eb8aa0fc85
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/java/io/bitsquare/trade/Trade.java
View File

@ -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();
}

2
core/src/main/java/io/bitsquare/trade/TradeManager.java
View File

@ -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()) {