Git-Mirrors/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2024-10-01 01:35:48 -04:00
Code Issues Packages Projects Releases Wiki Activity

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