mirror of
https://github.com/boldsuck/haveno.git
synced 2024-12-23 04:29:22 +00:00
remove popups
todo: remove entries from displayStrings.properties
This commit is contained in:
parent
defb82d240
commit
31b0f4e184
7 changed files with 3 additions and 68 deletions
|
@ -361,11 +361,7 @@ public class MainViewModel implements ViewModel, HavenoSetup.HavenoSetupListener
|
||||||
.onClose(privateNotificationManager::removePrivateNotification)
|
.onClose(privateNotificationManager::removePrivateNotification)
|
||||||
.useIUnderstandButton()
|
.useIUnderstandButton()
|
||||||
.show());
|
.show());
|
||||||
bisqSetup.setDisplaySecurityRecommendationHandler(key ->
|
bisqSetup.setDisplaySecurityRecommendationHandler(key -> {});
|
||||||
new Popup().headLine(Res.get("popup.securityRecommendation.headline"))
|
|
||||||
.information(Res.get("popup.securityRecommendation.msg"))
|
|
||||||
.dontShowAgainId(key)
|
|
||||||
.show());
|
|
||||||
bisqSetup.setDisplayLocalhostHandler(key -> {
|
bisqSetup.setDisplayLocalhostHandler(key -> {
|
||||||
if (!DevEnv.isDevMode()) {
|
if (!DevEnv.isDevMode()) {
|
||||||
Popup popup = new Popup().backgroundInfo(Res.get("popup.bitcoinLocalhostNode.msg"))
|
Popup popup = new Popup().backgroundInfo(Res.get("popup.bitcoinLocalhostNode.msg"))
|
||||||
|
@ -397,15 +393,7 @@ public class MainViewModel implements ViewModel, HavenoSetup.HavenoSetupListener
|
||||||
// We copy the array as we will mutate it later
|
// We copy the array as we will mutate it later
|
||||||
showAmazonGiftCardAccountUpdateWindow(new ArrayList<>(amazonGiftCardAccountList));
|
showAmazonGiftCardAccountUpdateWindow(new ArrayList<>(amazonGiftCardAccountList));
|
||||||
});
|
});
|
||||||
bisqSetup.setOsxKeyLoggerWarningHandler(() -> {
|
bisqSetup.setOsxKeyLoggerWarningHandler(() -> { });
|
||||||
String key = "osxKeyLoggerWarning";
|
|
||||||
if (preferences.showAgain(key)) {
|
|
||||||
new Popup().warning(Res.get("popup.warning.osxKeyLoggerWarning"))
|
|
||||||
.closeButtonText(Res.get("shared.iUnderstand"))
|
|
||||||
.dontShowAgainId(key)
|
|
||||||
.show();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
bisqSetup.setQubesOSInfoHandler(() -> {
|
bisqSetup.setQubesOSInfoHandler(() -> {
|
||||||
String key = "qubesOSSetupInfo";
|
String key = "qubesOSSetupInfo";
|
||||||
if (preferences.showAgain(key)) {
|
if (preferences.showAgain(key)) {
|
||||||
|
|
|
@ -270,14 +270,6 @@ public class AccountView extends ActivatableView<TabPane, Void> {
|
||||||
else
|
else
|
||||||
navigation.navigateTo(MainView.class, AccountView.class, FiatAccountsView.class);
|
navigation.navigateTo(MainView.class, AccountView.class, FiatAccountsView.class);
|
||||||
}
|
}
|
||||||
|
|
||||||
String key = "accountPrivacyInfo";
|
|
||||||
if (!DevEnv.isDevMode())
|
|
||||||
new Popup()
|
|
||||||
.headLine(Res.get("account.info.headline"))
|
|
||||||
.backgroundInfo(Res.get("account.info.msg"))
|
|
||||||
.dontShowAgainId(key)
|
|
||||||
.show();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -419,16 +419,6 @@ public abstract class MutableOfferView<M extends MutableOfferViewModel<?>> exten
|
||||||
|
|
||||||
balanceTextField.setTargetAmount(model.getDataModel().totalToPayAsCoinProperty().get());
|
balanceTextField.setTargetAmount(model.getDataModel().totalToPayAsCoinProperty().get());
|
||||||
|
|
||||||
if (!DevEnv.isDevMode()) {
|
|
||||||
String key = "securityDepositInfo";
|
|
||||||
new Popup().backgroundInfo(Res.get("popup.info.securityDepositInfo"))
|
|
||||||
.actionButtonText(Res.get("shared.faq"))
|
|
||||||
.onAction(() -> GUIUtil.openWebPage("https://bisq.wiki/Frequently_asked_questions#Why_does_Bisq_require_a_security_deposit_in_BTC.3F"))
|
|
||||||
.useIUnderstandButton()
|
|
||||||
.dontShowAgainId(key)
|
|
||||||
.show();
|
|
||||||
}
|
|
||||||
|
|
||||||
// temporarily disabled due to high CPU usage (per issue #4649)
|
// temporarily disabled due to high CPU usage (per issue #4649)
|
||||||
// waitingForFundsSpinner.play();
|
// waitingForFundsSpinner.play();
|
||||||
|
|
||||||
|
|
|
@ -1208,7 +1208,6 @@ public abstract class MutableOfferViewModel<M extends MutableOfferDataModel> ext
|
||||||
Coin checkAmount = dataModel.getMinAmount().get() == null ? dataModel.getAmount().get() : dataModel.getMinAmount().get();
|
Coin checkAmount = dataModel.getMinAmount().get() == null ? dataModel.getAmount().get() : dataModel.getMinAmount().get();
|
||||||
if (checkAmount != null && !checkAmount.isGreaterThan(OfferRestrictions.TOLERATED_SMALL_TRADE_AMOUNT)) {
|
if (checkAmount != null && !checkAmount.isGreaterThan(OfferRestrictions.TOLERATED_SMALL_TRADE_AMOUNT)) {
|
||||||
makeOfferFromUnsignedAccountWarningDisplayed = true;
|
makeOfferFromUnsignedAccountWarningDisplayed = true;
|
||||||
GUIUtil.showMakeOfferToUnsignedAccountWarning();
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -450,15 +450,6 @@ public class TakeOfferView extends ActivatableViewAndModel<AnchorPane, TakeOffer
|
||||||
balanceTextField.setTargetAmount(model.dataModel.getTotalToPayAsCoin().get());
|
balanceTextField.setTargetAmount(model.dataModel.getTotalToPayAsCoin().get());
|
||||||
|
|
||||||
if (!DevEnv.isDevMode()) {
|
if (!DevEnv.isDevMode()) {
|
||||||
String key = "securityDepositInfo";
|
|
||||||
new Popup().backgroundInfo(Res.get("popup.info.securityDepositInfo"))
|
|
||||||
.actionButtonText(Res.get("shared.faq"))
|
|
||||||
.onAction(() -> GUIUtil.openWebPage("https://bisq.wiki/Frequently_asked_questions#Why_does_Bisq_require_a_security_deposit_in_BTC.3F"))
|
|
||||||
.useIUnderstandButton()
|
|
||||||
.dontShowAgainId(key)
|
|
||||||
.show();
|
|
||||||
|
|
||||||
|
|
||||||
String tradeAmountText = model.isSeller() ? Res.get("takeOffer.takeOfferFundWalletInfo.tradeAmount", model.getTradeAmount()) : "";
|
String tradeAmountText = model.isSeller() ? Res.get("takeOffer.takeOfferFundWalletInfo.tradeAmount", model.getTradeAmount()) : "";
|
||||||
String message = Res.get("takeOffer.takeOfferFundWalletInfo.msg",
|
String message = Res.get("takeOffer.takeOfferFundWalletInfo.msg",
|
||||||
model.getTotalToPayInfo(),
|
model.getTotalToPayInfo(),
|
||||||
|
@ -467,7 +458,7 @@ public class TakeOfferView extends ActivatableViewAndModel<AnchorPane, TakeOffer
|
||||||
model.getTradeFee(),
|
model.getTradeFee(),
|
||||||
model.getTxFee()
|
model.getTxFee()
|
||||||
);
|
);
|
||||||
key = "takeOfferFundWalletInfo";
|
String key = "takeOfferFundWalletInfo";
|
||||||
new Popup().headLine(Res.get("takeOffer.takeOfferFundWalletInfo.headline"))
|
new Popup().headLine(Res.get("takeOffer.takeOfferFundWalletInfo.headline"))
|
||||||
.instruction(message)
|
.instruction(message)
|
||||||
.dontShowAgainId(key)
|
.dontShowAgainId(key)
|
||||||
|
@ -1106,7 +1097,6 @@ public class TakeOfferView extends ActivatableViewAndModel<AnchorPane, TakeOffer
|
||||||
// warn if you are selling BTC to unsigned account (#5343)
|
// warn if you are selling BTC to unsigned account (#5343)
|
||||||
if (model.isSellingToAnUnsignedAccount(offer) && !takeOfferFromUnsignedAccountWarningDisplayed) {
|
if (model.isSellingToAnUnsignedAccount(offer) && !takeOfferFromUnsignedAccountWarningDisplayed) {
|
||||||
takeOfferFromUnsignedAccountWarningDisplayed = true;
|
takeOfferFromUnsignedAccountWarningDisplayed = true;
|
||||||
UserThread.runAfter(() -> GUIUtil.showTakeOfferFromUnsignedAccountWarning(), 500, TimeUnit.MILLISECONDS);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -89,12 +89,6 @@ public class SettingsView extends ActivatableView<TabPane, Void> {
|
||||||
protected void activate() {
|
protected void activate() {
|
||||||
// Hide new badge if user saw this section
|
// Hide new badge if user saw this section
|
||||||
preferences.dontShowAgain(SettingsPresentation.SETTINGS_NEWS, true);
|
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);
|
root.getSelectionModel().selectedItemProperty().addListener(tabChangeListener);
|
||||||
navigation.addListener(navigationListener);
|
navigation.addListener(navigationListener);
|
||||||
|
|
|
@ -699,24 +699,6 @@ public class GUIUtil {
|
||||||
return t.cast(parent);
|
return t.cast(parent);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void showTakeOfferFromUnsignedAccountWarning() {
|
|
||||||
String key = "confirmTakeOfferFromUnsignedAccount";
|
|
||||||
new Popup().warning(Res.get("payment.takeOfferFromUnsignedAccount.warning"))
|
|
||||||
.width(900)
|
|
||||||
.closeButtonText(Res.get("shared.iConfirm"))
|
|
||||||
.dontShowAgainId(key)
|
|
||||||
.show();
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void showMakeOfferToUnsignedAccountWarning() {
|
|
||||||
String key = "confirmMakeOfferToUnsignedAccount";
|
|
||||||
new Popup().warning(Res.get("payment.makeOfferToUnsignedAccount.warning"))
|
|
||||||
.width(900)
|
|
||||||
.closeButtonText(Res.get("shared.iConfirm"))
|
|
||||||
.dontShowAgainId(key)
|
|
||||||
.show();
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void showClearXchangeWarning() {
|
public static void showClearXchangeWarning() {
|
||||||
String key = "confirmClearXchangeRequirements";
|
String key = "confirmClearXchangeRequirements";
|
||||||
final String currencyName = Config.baseCurrencyNetwork().getCurrencyName();
|
final String currencyName = Config.baseCurrencyNetwork().getCurrencyName();
|
||||||
|
|
Loading…
Reference in a new issue