nihilist/haveno
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove popups

Browse Source 
todo: remove entries from displayStrings.properties
This commit is contained in:
woodser 2022-07-11 11:02:09 -04:00
parent defb82d240
commit 31b0f4e184
7 changed files with 3 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
desktop/src/main/java/bisq/desktop/main/MainViewModel.java
View File

@ -361,11 +361,7 @@ public class MainViewModel implements ViewModel, HavenoSetup.HavenoSetupListener
.onClose(privateNotificationManager::removePrivateNotification)
.useIUnderstandButton()
.show());
bisqSetup.setDisplaySecurityRecommendationHandler(key ->
new Popup().headLine(Res.get("popup.securityRecommendation.headline"))
.information(Res.get("popup.securityRecommendation.msg"))
.dontShowAgainId(key)
.show());
bisqSetup.setDisplaySecurityRecommendationHandler(key -> {});
bisqSetup.setDisplayLocalhostHandler(key -> {
if (!DevEnv.isDevMode()) {
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
showAmazonGiftCardAccountUpdateWindow(new ArrayList<>(amazonGiftCardAccountList));
});
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.setOsxKeyLoggerWarningHandler(() -> { });
bisqSetup.setQubesOSInfoHandler(() -> {
String key = "qubesOSSetupInfo";
if (preferences.showAgain(key)) {

8
desktop/src/main/java/bisq/desktop/main/account/AccountView.java
View File

@ -270,14 +270,6 @@ public class AccountView extends ActivatableView<TabPane, Void> {
else
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

10
desktop/src/main/java/bisq/desktop/main/offer/MutableOfferView.java
View File

@ -419,16 +419,6 @@ public abstract class MutableOfferView<M extends MutableOfferViewModel<?>> exten
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)
// waitingForFundsSpinner.play();

1
desktop/src/main/java/bisq/desktop/main/offer/MutableOfferViewModel.java
View File

@ -1208,7 +1208,6 @@ public abstract class MutableOfferViewModel<M extends MutableOfferDataModel> ext
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();
}
}
}

12
desktop/src/main/java/bisq/desktop/main/offer/takeoffer/TakeOfferView.java
View File

@ -450,15 +450,6 @@ public class TakeOfferView extends ActivatableViewAndModel<AnchorPane, TakeOffer
balanceTextField.setTargetAmount(model.dataModel.getTotalToPayAsCoin().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();
String tradeAmountText = model.isSeller() ? Res.get("takeOffer.takeOfferFundWalletInfo.tradeAmount", model.getTradeAmount()) : "";
String message = Res.get("takeOffer.takeOfferFundWalletInfo.msg",
model.getTotalToPayInfo(),
@ -467,7 +458,7 @@ public class TakeOfferView extends ActivatableViewAndModel<AnchorPane, TakeOffer
model.getTradeFee(),
model.getTxFee()
);
key = "takeOfferFundWalletInfo";
String key = "takeOfferFundWalletInfo";
new Popup().headLine(Res.get("takeOffer.takeOfferFundWalletInfo.headline"))
.instruction(message)
.dontShowAgainId(key)
@ -1106,7 +1097,6 @@ public class TakeOfferView extends ActivatableViewAndModel<AnchorPane, TakeOffer
// warn if you are selling BTC to unsigned account (#5343)
if (model.isSellingToAnUnsignedAccount(offer) && !takeOfferFromUnsignedAccountWarningDisplayed) {
takeOfferFromUnsignedAccountWarningDisplayed = true;
UserThread.runAfter(() -> GUIUtil.showTakeOfferFromUnsignedAccountWarning(), 500, TimeUnit.MILLISECONDS);
}
}

6
desktop/src/main/java/bisq/desktop/main/settings/SettingsView.java
View File

@ -89,12 +89,6 @@ public class SettingsView extends ActivatableView<TabPane, Void> {
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);

18
desktop/src/main/java/bisq/desktop/util/GUIUtil.java
View File

@ -699,24 +699,6 @@ public class GUIUtil {
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() {
String key = "confirmClearXchangeRequirements";
final String currencyName = Config.baseCurrencyNetwork().getCurrencyName();