Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bug fixes: Locked Balance display; Portfolio History screen #5842

Merged
merged 2 commits into from Nov 25, 2021
Merged

Bug fixes: Locked Balance display; Portfolio History screen #5842

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cd4d98b
Fix exception in Portfolio History screen
Nov 18, 2021
e59596d
Add new block listener to update locked balance display
Nov 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions core/src/main/java/bisq/core/btc/Balances.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ public void onBalanceChanged(Coin balance, Transaction tx) {
updateBalance();
}
});
btcWalletService.addNewBestBlockListener(storedBlock -> updateBalance());

updateBalance();
}
Expand Down
9 changes: 7 additions & 2 deletions core/src/main/java/bisq/core/trade/ClosedTradableManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,8 +215,13 @@ public boolean isBsqTradeFee(Tradable tradable) {
return !tradable.getOffer().isCurrencyForMakerFeeBtc();
}

String feeTxId = castToTrade(tradable).getTakerFeeTxId();
return bsqWalletService.getTransaction(feeTxId) != null;
try {
String feeTxId = castToTrade(tradable).getTakerFeeTxId();
return bsqWalletService.getTransaction(feeTxId) != null;
} catch (ClassCastException ex) {
// this can happen when we have canceled offers in history, made using an old onion address
return !tradable.getOffer().isCurrencyForMakerFeeBtc();
}
}

public boolean isMaker(Tradable tradable) {
Expand Down