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

Jump to bottom

add alternative popup "no BSQ while Synchronizing DAO" #5766

Closed
wants to merge 15 commits into from
Closed

add alternative popup "no BSQ while Synchronizing DAO" #5766

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
f2cac86
Trade Step 1: add popup "no BSQ while Synchronizing DAO"
sneznaj Oct 19, 2021
030c891
Merge branch 'bisq-network:master' into master
sneznaj Oct 28, 2021
2dd9584
Update TakeOfferView.java
sneznaj Oct 30, 2021
97cf219
Update TakeOfferView.java
sneznaj Oct 30, 2021
f64584b
Update MutableOfferView.java
sneznaj Oct 30, 2021
21599d8
Update MutableOfferView.java
sneznaj Oct 30, 2021
56a1b5d
remove non english strings
sneznaj Nov 2, 2021
eb2e0e0
Merge branch 'bisq-network:master' into master
sneznaj Nov 3, 2021
6953b50
Merge branch 'bisq-network:master' into master
sneznaj Oct 28, 2021
5327740
Trade Step 1: add popup "no BSQ while Synchronizing DAO"
sneznaj Oct 19, 2021
f10b4b0
remove non english strings
sneznaj Nov 2, 2021
ada507b
Merge branch 'master' of https://github.com/sneznaj/bisq
sneznaj Nov 3, 2021
df1d0e9
Trade Step 1: add popup "no BSQ while Synchronizing DAO"
sneznaj Oct 19, 2021
97e5cac
Merge branch 'master' of https://github.com/sneznaj/bisq
sneznaj Nov 3, 2021
d25388c
Merge branch 'master' of https://github.com/sneznaj/bisq
sneznaj Nov 3, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions desktop/src/main/java/bisq/desktop/main/offer/takeoffer/TakeOfferView.java
View file
Open in desktop
Expand Up @@ -430,7 +430,7 @@ private void onTakeOffer() {
}

if (!model.dataModel.isTakerFeeValid()) {
showInsufficientBsqFundsForBtcFeePaymentPopup();
showNoBsqFundsAvailabeForBtcFeePaymentPopup();
return;
}

Expand Down Expand Up @@ -941,7 +941,7 @@ private void showFeeOption() {
String missingBsq = null;
if((daoFacade.getChainHeight() != bsqWalletService.getBestChainHeight()) || (bsqWalletService.getBestChainHeight() == 0))
message = Res.get("popup.warning.whileSynchronizingNoBsqFundsForBtcFeePayment");
else if (takerFee != null)
else if (takerFee != null)
missingBsq = Res.get("popup.warning.insufficientBsqFundsForBtcFeePayment",
bsqFormatter.formatCoinWithCode(takerFee.subtract(model.dataModel.getUsableBsqBalance())));
else if (model.dataModel.getUsableBsqBalance().isZero())
Expand Down Expand Up @@ -1237,7 +1237,7 @@ private VBox getTradeFeeFieldsBox() {
private void showNoBsqFundsAvailabeForBtcFeePaymentPopup() {
Coin takerFee = model.dataModel.getTakerFee(false);
String message = null;
if((daoFacade.getChainHeight() != bsqWalletService.getBestChainHeight()) || (bsqWalletService.getBestChainHeight() == 0)){
if ((daoFacade.getChainHeight() != bsqWalletService.getBestChainHeight()) || (bsqWalletService.getBestChainHeight() == 0)){
message = Res.get("popup.warning.whileSynchronizingNoBsqFundsForBtcFeePayment");
else if (takerFee != null) {
message = Res.get("popup.warning.insufficientBsqFundsForBtcFeePayment",
Expand Down