Add message text into one single label

Author: axpoems

apps/desktop/desktop/src/main/java/bisq/desktop/main/content/chat/message_container/list/ChatMessagesListController.java

@@ -767,7 +767,7 @@ private <M extends ChatMessage, C extends ChatChannel<M>> void addChatRulesWarni
     private TwoPartyPrivateChatMessage createChatRulesWarningMessage(TwoPartyPrivateChatChannel channel) {
         UserProfile receiverUserProfile = channel.getMyUserIdentity().getUserProfile();
         UserProfile senderUserProfile = channel.getPeer();
-        String text = Res.get("chat.private.chatRulesWarningMessage.text1");
+        String text = Res.get("chat.private.chatRulesWarningMessage.text");
         return new TwoPartyPrivateChatMessage(StringUtils.createUid(),
                 channel.getChatChannelDomain(),
                 channel.getId(),
@@ -785,7 +785,7 @@ private TwoPartyPrivateChatMessage createChatRulesWarningMessage(TwoPartyPrivate
     private BisqEasyOpenTradeMessage createChatRulesWarningMessage(BisqEasyOpenTradeChannel channel) {
         UserProfile receiverUserProfile = channel.getMyUserIdentity().getUserProfile();
         UserProfile senderUserProfile = channel.getPeer();
-        String text = Res.get("chat.private.chatRulesWarningMessage.text1");
+        String text = Res.get("chat.private.chatRulesWarningMessage.text");
         return new BisqEasyOpenTradeMessage(channel.getTradeId(),
                 StringUtils.createUid(),
                 channel.getId(),

apps/desktop/desktop/src/main/java/bisq/desktop/main/content/chat/message_container/list/message_box/ChatRulesWarningMessageBox.java

@@ -49,17 +49,13 @@ public ChatRulesWarningMessageBox(
         message.setAlignment(Pos.CENTER);
         message.setWrapText(true);
 
-        Label warningMessage = new Label(Res.get("chat.private.chatRulesWarningMessage.text2"));
-        warningMessage.getStyleClass().addAll("text-fill-grey-dimmed", "font-light", "medium-text");
         learnMoreLink = new Hyperlink(Res.get("chat.private.chatRulesWarningMessage.learnMore"));
         learnMoreLink.getStyleClass().addAll("text-fill-green", "font-light", "medium-text");
         learnMoreLink.setOnAction(e -> controller.onLearnMoreAboutChatRules());
-        HBox warningMessageAndLinkBox = new HBox(5, warningMessage, learnMoreLink);
-        warningMessageAndLinkBox.setAlignment(Pos.BASELINE_LEFT);
 
         VBox messageBg = new VBox();
         messageBg.setSpacing(5);
-        messageBg.getChildren().addAll(warningHeadline, message, warningMessageAndLinkBox);
+        messageBg.getChildren().addAll(warningHeadline, message, learnMoreLink);
         messageBg.setFillWidth(true);
         messageBg.setAlignment(Pos.CENTER_LEFT);
         messageBg.getStyleClass().add("system-message-background");

i18n/src/main/resources/chat.properties

@@ -115,10 +115,10 @@ chat.private.openChatsList.headline=Chat peers
 chat.private.leaveChat.confirmation=Are you sure you want to leave this chat?\n\
   You will lose access to the chat and all the chat information.
 chat.private.chatRulesWarningMessage.headline=Warning
-chat.private.chatRulesWarningMessage.text1=Do not exchange contact information to buy or sell Bitcoin outside Bisq \
+chat.private.chatRulesWarningMessage.text=Do not exchange contact information to buy or sell Bitcoin outside Bisq \
   in order to prevent fraud and scams. \
-  In case of such activity, peers should report it to moderators to identify potential Bisq rules violations.
-chat.private.chatRulesWarningMessage.text2=Users who engage in these practices will be banned from the network.
+  In case of such activity, peers should report it to moderators to identify potential Bisq rules violations. \
+  Users who engage in these practices will be banned from the network.
 chat.private.chatRulesWarningMessage.learnMore=Learn more