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

Only show rounding popup once during activation #2725

Merged
merged 1 commit into from
Apr 16, 2019
Merged

Only show rounding popup once during activation #2725

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 1 addition & 3 deletions desktop/src/main/java/bisq/desktop/main/offer/MutableOfferView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,8 +250,6 @@ protected void doActivate() {
balanceTextField.setTargetAmount(model.getDataModel().totalToPayAsCoinProperty().get());
updatePriceToggle();

showFiatRoundingInfoPopup();

boolean currencyForMakerFeeBtc = model.getDataModel().isCurrencyForMakerFeeBtc();
tradeFeeInBtcToggle.setSelected(currencyForMakerFeeBtc);
tradeFeeInBsqToggle.setSelected(!currencyForMakerFeeBtc);
Expand Down Expand Up @@ -346,7 +344,7 @@ public void setCloseHandler(OfferView.CloseHandler closeHandler) {
// UI actions
///////////////////////////////////////////////////////////////////////////////////////////

private void showFiatRoundingInfoPopup() {
protected void showFiatRoundingInfoPopup() {
if (CurrencyUtil.isFiatCurrency(model.tradeCurrencyCode.get()) && !DevEnv.isDevMode()) {
new Popup<>().headLine(Res.get("popup.roundedFiatValues.headline"))
.information(Res.get("popup.roundedFiatValues.msg", model.tradeCurrencyCode.get()))
Expand Down
5 changes: 5 additions & 0 deletions desktop/src/main/java/bisq/desktop/main/portfolio/editoffer/EditOfferView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,11 @@ protected void deactivate() {
removeBindings();
}

@Override
protected void showFiatRoundingInfoPopup() {
// don't show it again as it was already shown when creating the offer in the first place
}

///////////////////////////////////////////////////////////////////////////////////////////
// API
///////////////////////////////////////////////////////////////////////////////////////////
Expand Down