Skip to content

Commit

Permalink
Remove fiat rounding popup as feature was introduced a long time ago …
Browse files Browse the repository at this point in the history
…already
  • Loading branch information
ripcurlx committed Oct 8, 2019
1 parent 5f80e1f commit 247bcc4
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 26 deletions.
3 changes: 0 additions & 3 deletions core/src/main/resources/i18n/displayStrings.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2511,9 +2511,6 @@ popup.shutDownInProgress.msg=Shutting down application can take a few seconds.\n

popup.attention.forTradeWithId=Attention required for trade with ID {0}

popup.roundedFiatValues.headline=New privacy feature: Rounded fiat values
popup.roundedFiatValues.msg=To increase privacy of your trade the {0} amount was rounded.\n\nDepending on the client version you''ll pay or receive either values with decimals or rounded ones.\n\nBoth values do comply from now on with the trade protocol.\n\nAlso be aware that BTC values are changed automatically to match the rounded fiat amount as close as possible.

popup.info.multiplePaymentAccounts.headline=Multiple payment accounts available
popup.info.multiplePaymentAccounts.msg=You have multiple payment accounts available for this offer. Please make sure you've picked the right one.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -349,15 +349,6 @@ public void setCloseHandler(OfferView.CloseHandler closeHandler) {
// UI actions
///////////////////////////////////////////////////////////////////////////////////////////

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()))
.dontShowAgainId("FiatValuesRoundedWarning")
.show();
}
}

private void onPlaceOffer() {
if (model.getDataModel().canPlaceOffer()) {
if (model.getDataModel().isMakerFeeValid()) {
Expand Down Expand Up @@ -532,8 +523,6 @@ protected void onPaymentAccountsComboBoxSelected() {
model.onPaymentAccountSelected(paymentAccount);
model.onCurrencySelected(model.getDataModel().getTradeCurrency());
}

showFiatRoundingInfoPopup();
} else {
currencySelection.setVisible(false);
currencySelection.setManaged(false);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -306,13 +306,6 @@ protected void activate() {
showNextStepAfterAmountIsSet();
}

if (CurrencyUtil.isFiatCurrency(model.getOffer().getCurrencyCode()) && !DevEnv.isDevMode()) {
new Popup<>().headLine(Res.get("popup.roundedFiatValues.headline"))
.information(Res.get("popup.roundedFiatValues.msg", model.getOffer().getCurrencyCode()))
.dontShowAgainId("FiatValuesRoundedWarning")
.show();
}

boolean currencyForMakerFeeBtc = model.dataModel.isCurrencyForTakerFeeBtc();
tradeFeeInBtcToggle.setSelected(currencyForMakerFeeBtc);
tradeFeeInBsqToggle.setSelected(!currencyForMakerFeeBtc);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -130,11 +130,6 @@ 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

0 comments on commit 247bcc4

Please sign in to comment.