Ecosystem/haveno
Ecosystem/haveno
2
1
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2024-12-22 19:49:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

fix trade wallet balance in take offer view

Browse source
This commit is contained in:
woodser 2023-10-28 15:45:07 -04:00
parent fd171b5062
commit 1cbf14f477
1 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
desktop/src/main/java/haveno/desktop/main/offer/OfferDataModel.java
View file

@ -66,11 +66,6 @@ public abstract class OfferDataModel extends ActivatableDataModel {
protected void updateBalance() {
updateBalances();
if (useSavingsWallet) {
if (totalToPay.get() != null) {
balance.set(totalToPay.get().min(totalBalance));
}
}
missingCoin.set(offerUtil.getBalanceShortage(totalToPay.get(), balance.get()));
isXmrWalletFunded.set(offerUtil.isBalanceSufficient(totalToPay.get(), balance.get()));
if (totalToPay.get() != null && isXmrWalletFunded.get() && !showWalletFundedNotification.get()) {
@ -80,11 +75,6 @@ public abstract class OfferDataModel extends ActivatableDataModel {
protected void updateAvailableBalance() {
updateBalances();
if (useSavingsWallet) {
if (totalToPay.get() != null) {
availableBalance.set(totalToPay.get().min(totalAvailableBalance));
}
}
missingCoin.set(offerUtil.getBalanceShortage(totalToPay.get(), availableBalance.get()));
isXmrWalletFunded.set(offerUtil.isBalanceSufficient(totalToPay.get(), availableBalance.get()));
if (totalToPay.get() != null && isXmrWalletFunded.get() && !showWalletFundedNotification.get()) {
@ -96,8 +86,12 @@ public abstract class OfferDataModel extends ActivatableDataModel {
BigInteger tradeWalletBalance = xmrWalletService.getBalanceForSubaddress(addressEntry.getSubaddressIndex());
BigInteger tradeWalletAvailableBalance = xmrWalletService.getAvailableBalanceForSubaddress(addressEntry.getSubaddressIndex());
if (useSavingsWallet) {
totalBalance = xmrWalletService.getBalance();;
totalBalance = xmrWalletService.getBalance();
totalAvailableBalance = xmrWalletService.getAvailableBalance();
if (totalToPay.get() != null) {
balance.set(totalToPay.get().min(totalBalance));
availableBalance.set(totalToPay.get().min(totalAvailableBalance));
}
} else {
balance.set(tradeWalletBalance);
availableBalance.set(tradeWalletAvailableBalance);