mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-02-24 15:10:44 +01:00
Code Issues Projects Releases Packages Wiki Activity

CBM currency selection to use drop down combo

Browse source 
This changes CBM to use one currency per payment account.
This commit is contained in:
jmacxx 2021-01-24 11:21:41 -06:00 • committed by Christoph Atteneder
parent 172af9bd6b
commit d579361df7
No known key found for this signature in database
GPG key ID: CD5DC1C529CDFD3B
1 changed files with 12 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
desktop/src/main/java/bisq/desktop/components/paymentmethods/CashByMailForm.java
View file

@ -22,6 +22,7 @@ import bisq.desktop.util.Layout;
import bisq.core.account.witness.AccountAgeWitnessService; import bisq.core.account.witness.AccountAgeWitnessService;
import bisq.core.locale.CurrencyUtil; import bisq.core.locale.CurrencyUtil;
import bisq.core.locale.Res; import bisq.core.locale.Res;
import bisq.core.locale.TradeCurrency;
import bisq.core.payment.PaymentAccount; import bisq.core.payment.PaymentAccount;
import bisq.core.payment.CashByMailAccount; import bisq.core.payment.CashByMailAccount;
import bisq.core.payment.payload.PaymentAccountPayload; import bisq.core.payment.payload.PaymentAccountPayload;
@ -32,9 +33,10 @@ import bisq.core.util.validation.InputValidator;
import com.jfoenix.controls.JFXTextArea; import com.jfoenix.controls.JFXTextArea;
import javafx.scene.control.TextArea; import javafx.scene.control.TextArea;
import javafx.scene.layout.FlowPane;
import javafx.scene.layout.GridPane; import javafx.scene.layout.GridPane;
import javafx.collections.FXCollections;
import static bisq.desktop.util.FormBuilder.*; import static bisq.desktop.util.FormBuilder.*;
public class CashByMailForm extends PaymentMethodForm { public class CashByMailForm extends PaymentMethodForm {
@ -69,24 +71,13 @@ public class CashByMailForm extends PaymentMethodForm {
this.cashByMailAccount = (CashByMailAccount) paymentAccount; this.cashByMailAccount = (CashByMailAccount) paymentAccount;
} }
private void addCurrenciesGrid(boolean isEditable) {
FlowPane flowPane = addTopLabelFlowPane(gridPane, ++gridRow,
Res.get("payment.supportedCurrenciesForReceiver"), 20, 20).second;
if (isEditable) {
flowPane.setId("flow-pane-checkboxes-bg");
} else {
flowPane.setId("flow-pane-checkboxes-non-editable-bg");
}
CurrencyUtil.getMainFiatCurrencies().forEach(currency ->
fillUpFlowPaneWithCurrencies(isEditable, flowPane, currency, paymentAccount));
}
@Override @Override
public void addFormForAddAccount() { public void addFormForAddAccount() {
gridRowFrom = gridRow + 1; gridRowFrom = gridRow + 1;
addTradeCurrencyComboBox();
currencyComboBox.setItems(FXCollections.observableArrayList(CurrencyUtil.getAllSortedFiatCurrencies()));
contactField = addInputTextField(gridPane, ++gridRow, contactField = addInputTextField(gridPane, ++gridRow,
Res.get("payment.cashByMail.contact")); Res.get("payment.cashByMail.contact"));
contactField.setPromptText(Res.get("payment.cashByMail.contact.prompt")); contactField.setPromptText(Res.get("payment.cashByMail.contact.prompt"));
@ -113,8 +104,6 @@ public class CashByMailForm extends PaymentMethodForm {
updateFromInputs(); updateFromInputs();
}); });
addCurrenciesGrid(true);
addLimitations(false); addLimitations(false);
addAccountNameTextFieldWithAutoFillToggleButton(); addAccountNameTextFieldWithAutoFillToggleButton();
} }
@ -131,6 +120,11 @@ public class CashByMailForm extends PaymentMethodForm {
cashByMailAccount.getAccountName(), Layout.FIRST_ROW_AND_GROUP_DISTANCE); cashByMailAccount.getAccountName(), Layout.FIRST_ROW_AND_GROUP_DISTANCE);
addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("shared.paymentMethod"), addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("shared.paymentMethod"),
Res.get(cashByMailAccount.getPaymentMethod().getId())); Res.get(cashByMailAccount.getPaymentMethod().getId()));
TradeCurrency tradeCurrency = paymentAccount.getSingleTradeCurrency();
String nameAndCode = tradeCurrency != null ? tradeCurrency.getNameAndCode() : "";
addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("shared.currency"), nameAndCode);
addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.f2f.contact"), addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.f2f.contact"),
cashByMailAccount.getContact()); cashByMailAccount.getContact());
TextArea textArea = addCompactTopLabelTextArea(gridPane, ++gridRow, Res.get("payment.postal.address"), "").second; TextArea textArea = addCompactTopLabelTextArea(gridPane, ++gridRow, Res.get("payment.postal.address"), "").second;
@ -143,8 +137,6 @@ public class CashByMailForm extends PaymentMethodForm {
textAreaExtra.setMinHeight(70); textAreaExtra.setMinHeight(70);
textAreaExtra.setEditable(false); textAreaExtra.setEditable(false);
addCurrenciesGrid(false);
addLimitations(true); addLimitations(true);
} }
@ -153,6 +145,6 @@ public class CashByMailForm extends PaymentMethodForm {
allInputsValid.set(isAccountNameValid() allInputsValid.set(isAccountNameValid()
&& !postalAddressTextArea.getText().isEmpty() && !postalAddressTextArea.getText().isEmpty()
&& inputValidator.validate(cashByMailAccount.getContact()).isValid && inputValidator.validate(cashByMailAccount.getContact()).isValid
&& paymentAccount.getTradeCurrencies().size() > 0); && paymentAccount.getSingleTradeCurrency() != null);
} }
} }