Merge pull request #5349 from jmacxx/mediation_follow_up_issues

Review changes for Disputes GUI
bisq-network · Mar 24, 2021 · b0a5a94 · b0a5a94
2 parents e59f6af + e9b3b9a
commit b0a5a94
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/core/src/main/java/bisq/core/support/dispute/Dispute.java b/core/src/main/java/bisq/core/support/dispute/Dispute.java
@@ -409,8 +409,7 @@ public void refreshAlertLevel(boolean senderFlag) {
 
     public long unreadMessageCount(boolean senderFlag) {
         return chatMessages.stream()
-                .filter(m -> m.isSenderIsTrader() == senderFlag)
-                .filter(m -> !m.isSystemMessage())
+                .filter(m -> m.isSenderIsTrader() == senderFlag || m.isSystemMessage())
                 .filter(m -> !m.isWasDisplayed())
                 .count();
     }

diff --git a/desktop/src/main/java/bisq/desktop/bisq.css b/desktop/src/main/java/bisq/desktop/bisq.css
@@ -802,6 +802,10 @@ tree-table-view:focused {
     -fx-cursor: hand;
 }
 
+.alert {
+    -fx-text-fill: -bs-rd-error-red;
+}
+
 .opaque-icon {
     -fx-fill: -bs-color-gray-bbb;
     -fx-opacity: 1;

diff --git a/desktop/src/main/java/bisq/desktop/main/overlays/windows/DisputeSummaryWindow.java b/desktop/src/main/java/bisq/desktop/main/overlays/windows/DisputeSummaryWindow.java
@@ -311,7 +311,7 @@ private void addInfoPane() {
                 String status = DisplayUtils.formatDateTime(dispute.getTradePeriodEnd());
                 Label tradePeriodEnd = addConfirmationLabelLabel(gridPane, ++rowIndex, Res.get("disputeSummaryWindow.tradePeriodEnd"), status).second;
                 if (dispute.getTradePeriodEnd().toInstant().isAfter(Instant.now())) {
-                    tradePeriodEnd.getStyleClass().add("version-new"); // highlight field when the trade period is still active
+                    tradePeriodEnd.getStyleClass().add("alert"); // highlight field when the trade period is still active
                 }
             }
             if (dispute.getExtraDataMap() != null && dispute.getExtraDataMap().size() > 0) {