Traders chat

core/src/main/java/bisq/core/arbitration/DisputeChatSession.java

@@ -43,13 +43,12 @@
 public class DisputeChatSession extends ChatSession {
     private static final Logger log = LoggerFactory.getLogger(DisputeChatSession.class);
 
+    @Nullable
     private Dispute dispute;
     private DisputeManager disputeManager;
 
-    public DisputeChatSession(
-            @Nullable Dispute dispute,
-            DisputeManager disputeManager
-    ) {
+    public DisputeChatSession(@Nullable Dispute dispute,
+                              DisputeManager disputeManager) {
         super(DisputeCommunicationMessage.Type.DISPUTE);
         this.dispute = dispute;
         this.disputeManager = disputeManager;

core/src/main/java/bisq/core/trade/TradeManager.java

@@ -101,6 +101,7 @@ public class TradeManager implements PersistedDataHost {
     private static final Logger log = LoggerFactory.getLogger(TradeManager.class);
 
     private final User user;
+    @Getter
     private final KeyRing keyRing;
     private final BtcWalletService btcWalletService;
     private final BsqWalletService bsqWalletService;
@@ -109,7 +110,6 @@ public class TradeManager implements PersistedDataHost {
     private final ClosedTradableManager closedTradableManager;
     private final FailedTradesManager failedTradesManager;
     private final P2PService p2PService;
-    private final WalletsSetup walletsSetup;
     private final PriceFeedService priceFeedService;
     private final FilterManager filterManager;
     private final TradeStatisticsManager tradeStatisticsManager;
@@ -164,7 +164,6 @@ public TradeManager(User user,
         this.closedTradableManager = closedTradableManager;
         this.failedTradesManager = failedTradesManager;
         this.p2PService = p2PService;
-        this.walletsSetup = walletsSetup;
         this.priceFeedService = priceFeedService;
         this.filterManager = filterManager;
         this.tradeStatisticsManager = tradeStatisticsManager;

core/src/main/resources/i18n/displayStrings.properties

@@ -608,8 +608,17 @@ portfolio.pending.step2_seller.waitPayment.msg=The deposit transaction has at le
 portfolio.pending.step2_seller.warn=The BTC buyer still has not done the {0} payment.\nYou need to wait until they have started the payment.\nIf the trade has not been completed on {1} the arbitrator will investigate.
 portfolio.pending.step2_seller.openForDispute=The BTC buyer has not started his payment!\nThe max. allowed period for the trade has elapsed.\nYou can wait longer and give the trading peer more time or contact the arbitrator for opening a dispute.
 
-portfolio.pending.chatWindowTitle=Chat window for trade with ID ''{0}''
-portfolio.pending.openChat=Open chat window
+tradeChat.chatWindowTitle=Chat window for trade with ID ''{0}''
+tradeChat.openChat=Open chat window
+tradeChat.rules=You can communicate with your trade peer to resolve potential problems with this trade. It is not mandatory to reply in \
+  the chat. If a trader violates the below rules, open a dispute with 'cmd + o' and report it to the arbitrator.\n\n\
+  Chat rules:\n\
+  \t● Do not send links to unknown URLs (risk of malware). Links to a block explorer are permitted.\n\
+  \t● Do not try to motivate peer to trade outside of Bisq (no security).\n\
+  \t● Keep conversation friendly and respectful.\n\
+  \t● Do not engage in any form of social engineering scam attempts.\n\
+  \t● Respect if the peer is not responding and prefers to not communicate via the chat.\n\
+  \t● Keep conversation scope limited to the trade. This chat is not a messenger replacement or trollbox.
 
 # suppress inspection "UnusedProperty"
 message.state.UNDEFINED=Undefined

desktop/src/main/java/bisq/desktop/main/Chat/Chat.java

@@ -31,6 +31,7 @@
 import bisq.core.chat.ChatManager;
 import bisq.core.chat.ChatSession;
 import bisq.core.locale.Res;
+import bisq.core.trade.TradeChatSession;
 import bisq.core.util.BSFormatter;
 
 import bisq.network.p2p.NodeAddress;
@@ -200,8 +201,9 @@ public void display(ChatSession chatSession, @Nullable Button extraButton,
         inputTextArea = new BisqTextArea();
         inputTextArea.setPrefHeight(70);
         inputTextArea.setWrapText(true);
-        if (chatSession.isClient())
+        if (chatSession instanceof TradeChatSession || chatSession.isClient()) {
             inputTextArea.setPromptText(Res.get("support.input.prompt"));
+        }
 
         sendButton = new AutoTooltipButton(Res.get("support.send"));
         sendButton.setDefaultButton(true);

desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/PendingTradesView.java

@@ -316,6 +316,19 @@ private void openChat(Trade trade) {
         if (chatPopupStage != null)
             chatPopupStage.close();
 
+        if (trade.getCommunicationMessages().isEmpty()) {
+            DisputeCommunicationMessage disputeCommunicationMessage = new DisputeCommunicationMessage(
+                    DisputeCommunicationMessage.Type.TRADE,
+                    trade.getId(),
+                    0,
+                    false,
+                    Res.get("tradeChat.rules"),
+                    new NodeAddress("null:0000")
+            );
+            disputeCommunicationMessage.setSystemMessage(true);
+            trade.getCommunicationMessages().add(disputeCommunicationMessage);
+        }
+
         trade.getCommunicationMessages().forEach(m -> m.setWasDisplayed(true));
         trade.persist();
         tradeIdOfOpenChat = trade.getId();
@@ -326,7 +339,7 @@ private void openChat(Trade trade) {
         tradeChat.initialize();
 
         AnchorPane pane = new AnchorPane(tradeChat);
-        pane.setPrefSize(600, 400);
+        pane.setPrefSize(700, 500);
         AnchorPane.setLeftAnchor(tradeChat, 10d);
         AnchorPane.setRightAnchor(tradeChat, 10d);
         AnchorPane.setTopAnchor(tradeChat, -20d);
@@ -344,7 +357,7 @@ private void openChat(Trade trade) {
         tradeChat.scrollToBottom();
 
         chatPopupStage = new Stage();
-        chatPopupStage.setTitle(Res.get("portfolio.pending.chatWindowTitle", trade.getShortId()));
+        chatPopupStage.setTitle(Res.get("tradeChat.chatWindowTitle", trade.getShortId()));
         StackPane owner = MainView.getRootContainer();
         Scene rootScene = owner.getScene();
         chatPopupStage.initOwner(rootScene.getWindow());
@@ -642,7 +655,7 @@ public void updateItem(final PendingTradesListItem newItem, boolean empty) {
                                     Trade trade = newItem.getTrade();
 
                                     Label icon = AwesomeDude.createIconLabel(AwesomeIcon.COMMENTS_ALT, "25");
-                                    Tooltip.install(icon, new Tooltip(Res.get("portfolio.pending.openChat")));
+                                    Tooltip.install(icon, new Tooltip(Res.get("tradeChat.openChat")));
 
                                     JFXBadge numNewMsg = new JFXBadge(icon);
                                     // FIXME does not take position...