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.

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

Minor UI cleanups #5543

Merged
merged 3 commits into from
Jun 2, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 0 additions & 4 deletions core/src/main/resources/i18n/displayStrings.properties
Original file line number Diff line number Diff line change
Expand Up @@ -1400,7 +1400,6 @@ setting.about.shortcuts.sendFilter=Set Filter (privileged activity)
setting.about.shortcuts.sendPrivateNotification=Send private notification to peer (privileged activity)
setting.about.shortcuts.sendPrivateNotification.value=Open peer info at avatar and press: {0}

setting.info.headline=New XMR auto-confirm Feature
setting.info.msg=When selling BTC for XMR you can use the auto-confirm feature to verify that the correct amount of \
XMR was sent to your wallet so that Bisq can automatically mark the trade as complete, making trades quicker for everyone.\n\n\
Auto-confirm checks the XMR transaction on at least 2 XMR explorer nodes using the private transaction key provided \
Expand Down Expand Up @@ -2951,9 +2950,6 @@ popup.shutDownInProgress.headline=Shut down in progress
popup.shutDownInProgress.msg=Shutting down application can take a few seconds.\nPlease don't interrupt this process.

popup.attention.forTradeWithId=Attention required for trade with ID {0}
popup.attention.newFeatureDuplicateOffer=Version 1.6.3 introduces a new feature allowing easy re-entry of offers \
by right-clicking on an existing offer or trade within Portfolio menu and choosing `Create new offer like this`. \
This is useful for traders who frequently make the same offer.

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
1 change: 0 additions & 1 deletion desktop/src/main/java/bisq/desktop/main/MainView.java
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,6 @@ protected void initialize() {
JFXBadge portfolioButtonWithBadge = new JFXBadge(portfolioButton);
JFXBadge supportButtonWithBadge = new JFXBadge(supportButton);
JFXBadge settingsButtonWithBadge = new JFXBadge(settingsButton);
settingsButtonWithBadge.getStyleClass().add("new");

Locale locale = GlobalSettings.getLocale();
DecimalFormat currencyFormat = (DecimalFormat) NumberFormat.getNumberInstance(locale);
Expand Down
12 changes: 0 additions & 12 deletions desktop/src/main/java/bisq/desktop/main/MainViewModel.java
Original file line number Diff line number Diff line change
Expand Up @@ -274,18 +274,6 @@ public void onSetupComplete() {
}

getShowAppScreen().set(true);

// We only show the popup if the user has already set up any fiat account. For new users it is not a rule
// change and for altcoins its not relevant.
String key = "newFeatureDuplicateOffer";
if (DontShowAgainLookup.showAgain(key)) {
UserThread.runAfter(() -> {
new Popup().attention(Res.get("popup.attention.newFeatureDuplicateOffer")).
dontShowAgainId(key)
.closeButtonText(Res.get("shared.iUnderstand"))
.show();
}, 1);
}
}


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,7 @@ public abstract class MutableOfferViewModel<M extends MutableOfferDataModel> ext
final IntegerProperty marketPriceAvailableProperty = new SimpleIntegerProperty(-1);
private ChangeListener<Number> currenciesUpdateListener;
protected boolean syncMinAmountWithAmount = true;
private boolean makeOfferFromUnsignedAccountWarningDisplayed;

///////////////////////////////////////////////////////////////////////////////////////////
// Constructor, lifecycle
Expand Down Expand Up @@ -1236,10 +1237,12 @@ private void validateAndSetBuyerSecurityDepositToModel() {
}

private void maybeShowMakeOfferToUnsignedAccountWarning() {
if (dataModel.getDirection() == OfferPayload.Direction.SELL &&
if (!makeOfferFromUnsignedAccountWarningDisplayed &&
dataModel.getDirection() == OfferPayload.Direction.SELL &&
PaymentMethod.hasChargebackRisk(dataModel.getPaymentAccount().getPaymentMethod(), dataModel.getTradeCurrency().getCode())) {
Coin checkAmount = dataModel.getMinAmount().get() == null ? dataModel.getAmount().get() : dataModel.getMinAmount().get();
if (checkAmount != null && !checkAmount.isGreaterThan(OfferRestrictions.TOLERATED_SMALL_TRADE_AMOUNT)) {
makeOfferFromUnsignedAccountWarningDisplayed = true;
GUIUtil.showMakeOfferToUnsignedAccountWarning();
}
}
Expand Down
11 changes: 0 additions & 11 deletions desktop/src/main/java/bisq/desktop/main/settings/SettingsView.java
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@
import bisq.desktop.common.view.View;
import bisq.desktop.common.view.ViewLoader;
import bisq.desktop.main.MainView;
import bisq.desktop.main.overlays.popups.Popup;
import bisq.desktop.main.presentation.SettingsPresentation;
import bisq.desktop.main.settings.about.AboutView;
import bisq.desktop.main.settings.network.NetworkSettingsView;
import bisq.desktop.main.settings.preferences.PreferencesView;
Expand Down Expand Up @@ -87,15 +85,6 @@ else if (newValue == aboutTab)

@Override
protected void activate() {
// Hide new badge if user saw this section
preferences.dontShowAgain(SettingsPresentation.SETTINGS_NEWS, true);
String key = "autoConfirmInfo";
new Popup()
.headLine(Res.get("setting.info.headline"))
.backgroundInfo(Res.get("setting.info.msg"))
.dontShowAgainId(key)
.show();

root.getSelectionModel().selectedItemProperty().addListener(tabChangeListener);
navigation.addListener(navigationListener);

Expand Down