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

Merge pull request #5363 from jmacxx/fix_ClassCastException2

Browse source 
Fix ClassCastError in Portfolio History Summary Popup
This commit is contained in:
Christoph Atteneder 2021-03-28 20:14:17 +02:00 • committed by GitHub
commit 58d93f6e04
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
desktop/src/main/java/bisq/desktop/main/portfolio/closedtrades/ClosedTradesDataModel.java
View file

@ -25,6 +25,7 @@ import bisq.core.monetary.Price;
import bisq.core.monetary.Volume;
import bisq.core.offer.Offer;
import bisq.core.offer.OfferPayload;
import bisq.core.offer.OpenOffer;
import bisq.core.provider.price.MarketPrice;
import bisq.core.provider.price.PriceFeedService;
import bisq.core.trade.Tradable;
@ -159,7 +160,7 @@ class ClosedTradesDataModel extends ActivatableDataModel {
return Coin.valueOf(getList().stream()
.map(ClosedTradableListItem::getTradable)
.mapToLong(tradable -> {
if (wasMyOffer(tradable)) {
if (wasMyOffer(tradable) || tradable instanceof OpenOffer) {
return tradable.getOffer().getTxFee().value;
} else {
// taker pays for 3 transactions
@ -178,7 +179,7 @@ class ClosedTradesDataModel extends ActivatableDataModel {
protected long getTradeFee(Tradable tradable, boolean expectBtcFee) {
Offer offer = tradable.getOffer();
if (wasMyOffer(tradable)) {
if (wasMyOffer(tradable) || tradable instanceof OpenOffer) {
String makerFeeTxId = offer.getOfferFeePaymentTxId();
boolean notInBsqWallet = bsqWalletService.getTransaction(makerFeeTxId) == null;
if (expectBtcFee) {

2
desktop/src/main/java/bisq/desktop/main/portfolio/closedtrades/ClosedTradesViewModel.java
View file

@ -152,7 +152,7 @@ public class ClosedTradesViewModel extends ActivatableWithDataModel<ClosedTrades
Tradable tradable = item.getTradable();
Offer offer = tradable.getOffer();
if (wasMyOffer(tradable)) {
if (wasMyOffer(tradable) || tradable instanceof OpenOffer) {
// I was maker so we use offer
return offer.isCurrencyForMakerFeeBtc();
} else {