Add account signing state to payment account selection

bisq-network · Oct 14, 2019 · fb7af25 · fb7af25
1 parent 0dcc20c
commit fb7af25
Show file tree

Hide file tree

Showing 7 changed files with 89 additions and 4 deletions.
diff --git a/desktop/src/main/java/bisq/desktop/main/offer/MutableOfferView.java b/desktop/src/main/java/bisq/desktop/main/offer/MutableOfferView.java
@@ -213,6 +213,7 @@ protected void initialize() {
         paymentAccountsComboBox.setConverter(GUIUtil.getPaymentAccountsComboBoxStringConverter());
         paymentAccountsComboBox.setButtonCell(GUIUtil.getComboBoxButtonCell(Res.get("shared.selectTradingAccount"),
                 paymentAccountsComboBox, false));
+        paymentAccountsComboBox.setCellFactory(model.getPaymentAccountListCellFactory(paymentAccountsComboBox));
 
         doSetFocus();
     }

diff --git a/desktop/src/main/java/bisq/desktop/main/offer/MutableOfferViewModel.java b/desktop/src/main/java/bisq/desktop/main/offer/MutableOfferViewModel.java
@@ -35,6 +35,7 @@
 import bisq.desktop.util.validation.MonetaryValidator;
 import bisq.desktop.util.validation.SecurityDepositValidator;
 
+import bisq.core.account.witness.AccountAgeWitnessService;
 import bisq.core.btc.wallet.Restrictions;
 import bisq.core.locale.CurrencyUtil;
 import bisq.core.locale.Res;
@@ -66,6 +67,10 @@
 
 import javax.inject.Inject;
 
+import javafx.scene.control.ComboBox;
+import javafx.scene.control.ListCell;
+import javafx.scene.control.ListView;
+
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.IntegerProperty;
 import javafx.beans.property.ObjectProperty;
@@ -76,6 +81,8 @@
 import javafx.beans.property.StringProperty;
 import javafx.beans.value.ChangeListener;
 
+import javafx.util.Callback;
+
 import java.util.Optional;
 import java.util.concurrent.TimeUnit;
 
@@ -86,6 +93,7 @@ public abstract class MutableOfferViewModel<M extends MutableOfferDataModel> ext
     private final BsqValidator bsqValidator;
     protected final SecurityDepositValidator securityDepositValidator;
     private final PriceFeedService priceFeedService;
+    private AccountAgeWitnessService accountAgeWitnessService;
     private final Navigation navigation;
     private final Preferences preferences;
     protected final BSFormatter btcFormatter;
@@ -185,6 +193,7 @@ public MutableOfferViewModel(M dataModel,
                                  BsqValidator bsqValidator,
                                  SecurityDepositValidator securityDepositValidator,
                                  PriceFeedService priceFeedService,
+                                 AccountAgeWitnessService accountAgeWitnessService,
                                  Navigation navigation,
                                  Preferences preferences,
                                  BSFormatter btcFormatter,
@@ -198,6 +207,7 @@ public MutableOfferViewModel(M dataModel,
         this.bsqValidator = bsqValidator;
         this.securityDepositValidator = securityDepositValidator;
         this.priceFeedService = priceFeedService;
+        this.accountAgeWitnessService = accountAgeWitnessService;
         this.navigation = navigation;
         this.preferences = preferences;
         this.btcFormatter = btcFormatter;
@@ -1042,6 +1052,11 @@ public Offer createAndGetOffer() {
         return offer;
     }
 
+    public Callback<ListView<PaymentAccount>, ListCell<PaymentAccount>> getPaymentAccountListCellFactory(
+            ComboBox<PaymentAccount> paymentAccountsComboBox) {
+        return GUIUtil.getPaymentAccountListCellFactory(paymentAccountsComboBox, accountAgeWitnessService);
+    }
+
     public M getDataModel() {
         return dataModel;
     }

diff --git a/desktop/src/main/java/bisq/desktop/main/offer/createoffer/CreateOfferViewModel.java b/desktop/src/main/java/bisq/desktop/main/offer/createoffer/CreateOfferViewModel.java
@@ -27,6 +27,7 @@
 import bisq.desktop.util.validation.FiatVolumeValidator;
 import bisq.desktop.util.validation.SecurityDepositValidator;
 
+import bisq.core.account.witness.AccountAgeWitnessService;
 import bisq.core.provider.price.PriceFeedService;
 import bisq.core.user.Preferences;
 import bisq.core.util.BSFormatter;
@@ -45,6 +46,7 @@ public CreateOfferViewModel(CreateOfferDataModel dataModel,
                                 BsqValidator bsqValidator,
                                 SecurityDepositValidator securityDepositValidator,
                                 PriceFeedService priceFeedService,
+                                AccountAgeWitnessService accountAgeWitnessService,
                                 Navigation navigation,
                                 Preferences preferences,
                                 BSFormatter btcFormatter,
@@ -57,9 +59,9 @@ public CreateOfferViewModel(CreateOfferDataModel dataModel,
                 bsqValidator,
                 securityDepositValidator,
                 priceFeedService,
+                accountAgeWitnessService,
                 navigation,
                 preferences,
-                btcFormatter,
-                bsqFormatter);
+                btcFormatter, bsqFormatter);
     }
 }
diff --git a/desktop/src/main/java/bisq/desktop/main/offer/takeoffer/TakeOfferView.java b/desktop/src/main/java/bisq/desktop/main/offer/takeoffer/TakeOfferView.java
@@ -834,6 +834,7 @@ private void addPaymentGroup() {
         paymentAccountsComboBox = paymentAccountTuple.first;
         HBox.setMargin(paymentAccountsComboBox, new Insets(Layout.FLOATING_LABEL_DISTANCE, 0, 0, 0));
         paymentAccountsComboBox.setConverter(GUIUtil.getPaymentAccountsComboBoxStringConverter());
+        paymentAccountsComboBox.setCellFactory(model.getPaymentAccountListCellFactory(paymentAccountsComboBox));
         paymentAccountsComboBox.setVisible(false);
         paymentAccountsComboBox.setManaged(false);
         paymentAccountsComboBox.setOnAction(e -> {

diff --git a/desktop/src/main/java/bisq/desktop/main/offer/takeoffer/TakeOfferViewModel.java b/desktop/src/main/java/bisq/desktop/main/offer/takeoffer/TakeOfferViewModel.java
@@ -28,6 +28,7 @@
 import bisq.desktop.util.GUIUtil;
 import bisq.desktop.util.validation.BtcValidator;
 
+import bisq.core.account.witness.AccountAgeWitnessService;
 import bisq.core.btc.setup.WalletsSetup;
 import bisq.core.locale.CurrencyUtil;
 import bisq.core.locale.Res;
@@ -57,6 +58,10 @@
 
 import javax.inject.Inject;
 
+import javafx.scene.control.ComboBox;
+import javafx.scene.control.ListCell;
+import javafx.scene.control.ListView;
+
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleBooleanProperty;
@@ -67,6 +72,8 @@
 
 import javafx.collections.ObservableList;
 
+import javafx.util.Callback;
+
 import java.util.Optional;
 
 import javax.annotation.Nullable;
@@ -81,6 +88,7 @@ class TakeOfferViewModel extends ActivatableWithDataModel<TakeOfferDataModel> im
     private final WalletsSetup walletsSetup;
     private final Preferences preferences;
     private final PriceFeedService priceFeedService;
+    private AccountAgeWitnessService accountAgeWitnessService;
     private final Navigation navigation;
     private final BSFormatter btcFormatter;
     private final BsqFormatter bsqFormatter;
@@ -141,6 +149,7 @@ public TakeOfferViewModel(TakeOfferDataModel dataModel,
                               WalletsSetup walletsSetup,
                               Preferences preferences,
                               PriceFeedService priceFeedService,
+                              AccountAgeWitnessService accountAgeWitnessService,
                               Navigation navigation,
                               BSFormatter btcFormatter,
                               BsqFormatter bsqFormatter) {
@@ -152,6 +161,7 @@ public TakeOfferViewModel(TakeOfferDataModel dataModel,
         this.walletsSetup = walletsSetup;
         this.preferences = preferences;
         this.priceFeedService = priceFeedService;
+        this.accountAgeWitnessService = accountAgeWitnessService;
         this.navigation = navigation;
         this.btcFormatter = btcFormatter;
         this.bsqFormatter = bsqFormatter;
@@ -778,4 +788,9 @@ public String getSellerSecurityDeposit() {
     private BSFormatter getFormatterForTakerFee() {
         return dataModel.isCurrencyForTakerFeeBtc() ? btcFormatter : bsqFormatter;
     }
+
+    public Callback<ListView<PaymentAccount>, ListCell<PaymentAccount>> getPaymentAccountListCellFactory(
+            ComboBox<PaymentAccount> paymentAccountsComboBox) {
+        return GUIUtil.getPaymentAccountListCellFactory(paymentAccountsComboBox, accountAgeWitnessService);
+    }
 }
diff --git a/desktop/src/main/java/bisq/desktop/main/portfolio/editoffer/EditOfferViewModel.java b/desktop/src/main/java/bisq/desktop/main/portfolio/editoffer/EditOfferViewModel.java
@@ -26,6 +26,7 @@
 import bisq.desktop.util.validation.FiatVolumeValidator;
 import bisq.desktop.util.validation.SecurityDepositValidator;
 
+import bisq.core.account.witness.AccountAgeWitnessService;
 import bisq.core.offer.OpenOffer;
 import bisq.core.provider.price.PriceFeedService;
 import bisq.core.user.Preferences;
@@ -48,6 +49,7 @@ public EditOfferViewModel(EditOfferDataModel dataModel,
                               BsqValidator bsqValidator,
                               SecurityDepositValidator securityDepositValidator,
                               PriceFeedService priceFeedService,
+                              AccountAgeWitnessService accountAgeWitnessService,
                               Navigation navigation,
                               Preferences preferences,
                               BSFormatter btcFormatter,
@@ -60,10 +62,10 @@ public EditOfferViewModel(EditOfferDataModel dataModel,
                 bsqValidator,
                 securityDepositValidator,
                 priceFeedService,
+                accountAgeWitnessService,
                 navigation,
                 preferences,
-                btcFormatter,
-                bsqFormatter);
+                btcFormatter, bsqFormatter);
         syncMinAmountWithAmount = false;
     }
 

diff --git a/desktop/src/main/java/bisq/desktop/util/GUIUtil.java b/desktop/src/main/java/bisq/desktop/util/GUIUtil.java
@@ -21,12 +21,15 @@
 import bisq.desktop.app.BisqApp;
 import bisq.desktop.components.AutoTooltipLabel;
 import bisq.desktop.components.BisqTextArea;
+import bisq.desktop.components.InfoAutoTooltipLabel;
 import bisq.desktop.components.indicator.TxConfidenceIndicator;
 import bisq.desktop.main.MainView;
 import bisq.desktop.main.account.AccountView;
 import bisq.desktop.main.account.content.fiataccounts.FiatAccountsView;
 import bisq.desktop.main.overlays.popups.Popup;
 
+import bisq.core.account.witness.AccountAgeWitness;
+import bisq.core.account.witness.AccountAgeWitnessService;
 import bisq.core.app.BisqEnvironment;
 import bisq.core.btc.setup.WalletsSetup;
 import bisq.core.btc.wallet.WalletsManager;
@@ -84,6 +87,8 @@
 
 import org.apache.commons.lang3.StringUtils;
 
+import de.jensd.fx.glyphs.materialdesignicons.MaterialDesignIcon;
+
 import javafx.stage.DirectoryChooser;
 import javafx.stage.FileChooser;
 import javafx.stage.Modality;
@@ -818,6 +823,50 @@ public PaymentAccount fromString(String s) {
         };
     }
 
+    public static Callback<ListView<PaymentAccount>, ListCell<PaymentAccount>> getPaymentAccountListCellFactory(
+            ComboBox<PaymentAccount> paymentAccountsComboBox,
+            AccountAgeWitnessService accountAgeWitnessService) {
+        return p -> new ListCell<>() {
+            @Override
+            protected void updateItem(PaymentAccount item, boolean empty) {
+                super.updateItem(item, empty);
+
+                if (item != null && !empty) {
+
+                    boolean needsSigning = PaymentMethod.hasChargebackRisk(item.getPaymentMethod(),
+                            item.getTradeCurrencies());
+
+                    InfoAutoTooltipLabel label = new InfoAutoTooltipLabel(
+                            paymentAccountsComboBox.getConverter().toString(item),
+                            ContentDisplay.RIGHT);
+
+                    if (needsSigning) {
+                        AccountAgeWitness myWitness = accountAgeWitnessService.getMyWitness(
+                                item.paymentAccountPayload);
+                        AccountAgeWitnessService.SignState signState =
+                                accountAgeWitnessService.getSignState(myWitness);
+                        String info = StringUtils.capitalize(signState.getPresentation());
+
+                        MaterialDesignIcon icon;
+
+                        switch (signState) {
+                            case PEER_SIGNER:
+                            case ARBITRATOR:
+                                icon = MaterialDesignIcon.APPROVAL;
+                                break;
+                            default:
+                                icon = MaterialDesignIcon.ALERT_CIRCLE_OUTLINE;
+                        }
+                        label.setIcon(icon, info);
+                    }
+                    setGraphic(label);
+                } else {
+                    setGraphic(null);
+                }
+            }
+        };
+    }
+
     public static void removeChildrenFromGridPaneRows(GridPane gridPane, int start, int end) {
         Map<Integer, List<Node>> childByRowMap = new HashMap<>();
         gridPane.getChildren().forEach(child -> {