mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-02-25 07:27:18 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix merge conflicts

Browse source
This commit is contained in:
chimp1984 2020-10-01 10:35:30 -05:00
parent ff1380481d
commit d84122259b
No known key found for this signature in database
GPG key ID: 9801B4EC591F90E3
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
core/src/main/java/bisq/core/app/WalletAppSetup.java
View file

@ -235,7 +235,7 @@ public class WalletAppSetup {
}, 1); }, 1);
}); });
tradeManager.getTradableList().stream() tradeManager.getTradesAsObservableList().stream()
.filter(trade -> trade.getOffer() != null) .filter(trade -> trade.getOffer() != null)
.forEach(trade -> { .forEach(trade -> {
String details = null; String details = null;
@ -255,7 +255,6 @@ public class WalletAppSetup {
rejectedTxErrorMessageHandler.accept(Res.get("popup.warning.trade.txRejected", rejectedTxErrorMessageHandler.accept(Res.get("popup.warning.trade.txRejected",
finalDetails, trade.getShortId(), txId)); finalDetails, trade.getShortId(), txId));
} }
tradeManager.addTradeToFailedTrades(trade);
}, 1); }, 1);
} }
}); });