mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-02-24 15:10:44 +01:00
Code Issues Projects Releases Packages Wiki Activity

@m52go edits and popup informing new feature

Browse source
This commit is contained in:
jmacxx 2021-04-21 15:54:16 -05:00
parent 7f73df5dfd
commit a5d5eafddf
No known key found for this signature in database
GPG key ID: 155297BABFE94A1B
2 changed files with 8 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
core/src/main/resources/i18n/displayStrings.properties
View file

@ -584,8 +584,8 @@ portfolio.tab.history=History
portfolio.tab.failed=Failed
portfolio.tab.editOpenOffer=Edit offer
portfolio.tab.duplicateOffer=Duplicate offer
portfolio.context.offerLikeThis=New offer like this...
portfolio.context.notYourOffer=You can only duplicate trades where you were the maker.
portfolio.context.offerLikeThis=Create new offer like this...
portfolio.context.notYourOffer=You can only duplicate offers where you were the maker.
portfolio.closedTrades.deviation.help=Percentage price deviation from market
@ -2948,9 +2948,9 @@ 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.reasonForPaymentRuleChange=Version 1.5.5 introduces a critical trade rule change regarding \
the \"reason for payment\" field in bank transfers. Please leave this field empty -- \
DO NOT use the trade ID as \"reason for payment\" anymore.
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 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.

14
desktop/src/main/java/bisq/desktop/main/MainViewModel.java
View file

@ -278,22 +278,14 @@ public class MainViewModel implements ViewModel, BisqSetup.BisqSetupListener {
// 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 = "reasonForPaymentChange";
boolean hasFiatAccount = user.getPaymentAccounts() != null &&
user.getPaymentAccounts().stream()
.filter(e -> !(e.getPaymentAccountPayload() instanceof AssetsAccountPayload))
.findAny()
.isPresent();
if (hasFiatAccount && DontShowAgainLookup.showAgain(key)) {
String key = "newFeatureDuplicateOffer";
if (DontShowAgainLookup.showAgain(key)) {
UserThread.runAfter(() -> {
new Popup().attention(Res.get("popup.attention.reasonForPaymentRuleChange")).
new Popup().attention(Res.get("popup.attention.newFeatureDuplicateOffer")).
dontShowAgainId(key)
.closeButtonText(Res.get("shared.iUnderstand"))
.show();
}, 1);
} else {
// If user add a fiat account later we don't show the popup as we assume it is a new user.
DontShowAgainLookup.dontShowAgain(key, true);
}
}