Add payment methods column

bisq-network · Dec 2, 2024 · ae7c840 · ae7c840
1 parent 587aa08
commit ae7c840
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 4 deletions.
diff --git a/.../desktop/desktop/src/main/java/bisq/desktop/main/content/bisq_easy/BisqEasyViewUtils.java b/.../desktop/desktop/src/main/java/bisq/desktop/main/content/bisq_easy/BisqEasyViewUtils.java
@@ -81,7 +81,6 @@ public static StackPane getCustomPaymentMethodIcon(String customPaymentMethod) {
     public static HBox getPaymentAndSettlementMethodsBox(List<FiatPaymentMethod> paymentMethods,
                                                          List<BitcoinPaymentMethod> settlementMethods) {
         HBox hBox = new HBox(8);
-        hBox.setAlignment(Pos.BOTTOM_LEFT);
         for (FiatPaymentMethod paymentMethod : paymentMethods) {
             hBox.getChildren().add(createMethodLabel(paymentMethod));
         }

diff --git a/...a/bisq/desktop/main/content/chat/message_container/list/message_box/BubbleMessageBox.java b/...a/bisq/desktop/main/content/chat/message_container/list/message_box/BubbleMessageBox.java
@@ -267,9 +267,12 @@ private HBox createAndGetAmountAndPriceBox() {
     }
 
     private HBox createAndGetPaymentAndSettlementMethodsBox() {
-        return item.isBisqEasyPublicChatMessageWithOffer()
-                ? BisqEasyViewUtils.getPaymentAndSettlementMethodsBox(item.getBisqEasyOfferPaymentMethods(), item.getBisqEasyOfferSettlementMethods())
-                : new HBox();
+        if (item.isBisqEasyPublicChatMessageWithOffer()) {
+            HBox hBox = BisqEasyViewUtils.getPaymentAndSettlementMethodsBox(item.getBisqEasyOfferPaymentMethods(), item.getBisqEasyOfferSettlementMethods());
+            hBox.setAlignment(Pos.BOTTOM_LEFT);
+            return hBox;
+        }
+        return new HBox();
     }
 
     private VBox createAndGetQuotedMessageBox() {

diff --git a/...c/main/java/bisq/desktop/main/content/user/profile_card/offers/ProfileCardOffersView.java b/...c/main/java/bisq/desktop/main/content/user/profile_card/offers/ProfileCardOffersView.java
@@ -21,6 +21,7 @@
 import bisq.desktop.components.controls.BisqTooltip;
 import bisq.desktop.components.table.BisqTableColumn;
 import bisq.desktop.components.table.BisqTableView;
+import bisq.desktop.main.content.bisq_easy.BisqEasyViewUtils;
 import bisq.desktop.main.content.bisq_easy.offerbook.offerbook_list.OfferbookListItem;
 import bisq.desktop.main.content.components.MarketImageComposition;
 import bisq.i18n.Res;
@@ -96,6 +97,13 @@ private void configTableView() {
                 .comparator(Comparator.comparing(OfferbookListItem::getPriceSpecAsPercent))
                 .setCellFactory(getPriceCellFactory())
                 .build());
+
+        tableView.getColumns().add(new BisqTableColumn.Builder<OfferbookListItem>()
+                .title(Res.get("user.profileCard.offers.table.columns.paymentMethods"))
+                .left()
+                .isSortable(false)
+                .setCellFactory(getPaymentMethodsCellFactory())
+                .build());
     }
 
     private Callback<TableColumn<OfferbookListItem, OfferbookListItem>,
@@ -151,4 +159,24 @@ protected void updateItem(OfferbookListItem item, boolean empty) {
             }
         };
     }
+
+    private Callback<TableColumn<OfferbookListItem, OfferbookListItem>,
+            TableCell<OfferbookListItem, OfferbookListItem>> getPaymentMethodsCellFactory() {
+        return column -> new TableCell<>() {
+            @Override
+            protected void updateItem(OfferbookListItem item, boolean empty) {
+                super.updateItem(item, empty);
+
+                if (item != null && !empty) {
+                    HBox paymentMethodsBox = BisqEasyViewUtils.getPaymentAndSettlementMethodsBox(
+                            item.getFiatPaymentMethods(), item.getBitcoinPaymentMethods());
+                    paymentMethodsBox.setAlignment(Pos.CENTER_LEFT);
+                    paymentMethodsBox.setPadding(new Insets(0, 10, 0, 0));
+                    setGraphic(paymentMethodsBox);
+                } else {
+                    setGraphic(null);
+                }
+            }
+        };
+    }
 }