From a5d5eafddf7d575be42068b477d9b0dd4d29280c Mon Sep 17 00:00:00 2001
From: jmacxx <47253594+jmacxx@users.noreply.github.com>
Date: Wed, 21 Apr 2021 15:54:16 -0500
Subject: [PATCH] @m52go edits and popup informing new feature

---
 .../main/resources/i18n/displayStrings.properties  | 10 +++++-----
 .../main/java/bisq/desktop/main/MainViewModel.java | 14 +++-----------
 2 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/core/src/main/resources/i18n/displayStrings.properties b/core/src/main/resources/i18n/displayStrings.properties
index 7b833955df..9fc8b0582d 100644
--- a/core/src/main/resources/i18n/displayStrings.properties
+++ b/core/src/main/resources/i18n/displayStrings.properties
@@ -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.
diff --git a/desktop/src/main/java/bisq/desktop/main/MainViewModel.java b/desktop/src/main/java/bisq/desktop/main/MainViewModel.java
index e787e6ad22..d9e14837de 100644
--- a/desktop/src/main/java/bisq/desktop/main/MainViewModel.java
+++ b/desktop/src/main/java/bisq/desktop/main/MainViewModel.java
@@ -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);
         }
     }