diff --git a/assets/src/main/java/bisq/asset/coins/Ergo.java b/assets/src/main/java/bisq/asset/coins/Ergo.java index fd9ae801cda..086f8276490 100644 --- a/assets/src/main/java/bisq/asset/coins/Ergo.java +++ b/assets/src/main/java/bisq/asset/coins/Ergo.java @@ -21,10 +21,8 @@ import bisq.asset.AddressValidator; import bisq.asset.Coin; -import java.util.Arrays; - -import org.bitcoinj.core.Base58; import org.bitcoinj.core.AddressFormatException; +import org.bitcoinj.core.Base58; public class Ergo extends Coin { diff --git a/core/src/main/java/bisq/core/notifications/alerts/DisputeMsgEvents.java b/core/src/main/java/bisq/core/notifications/alerts/DisputeMsgEvents.java index 8e03379dd6a..3aa011a64de 100644 --- a/core/src/main/java/bisq/core/notifications/alerts/DisputeMsgEvents.java +++ b/core/src/main/java/bisq/core/notifications/alerts/DisputeMsgEvents.java @@ -33,7 +33,6 @@ import javax.inject.Singleton; import javafx.collections.ListChangeListener; -import javafx.collections.ObservableList; import java.util.Comparator; import java.util.Optional; diff --git a/core/src/main/java/bisq/core/payment/JapanBankAccount.java b/core/src/main/java/bisq/core/payment/JapanBankAccount.java index b2d9fede114..8aa952d074d 100644 --- a/core/src/main/java/bisq/core/payment/JapanBankAccount.java +++ b/core/src/main/java/bisq/core/payment/JapanBankAccount.java @@ -17,19 +17,10 @@ package bisq.core.payment; +import bisq.core.locale.FiatCurrency; import bisq.core.payment.payload.JapanBankAccountPayload; import bisq.core.payment.payload.PaymentAccountPayload; import bisq.core.payment.payload.PaymentMethod; -import bisq.core.payment.payload.JapanBankAccountPayload; - -import org.jetbrains.annotations.NotNull; - -import lombok.Getter; -import lombok.Setter; - -import bisq.core.locale.Country; -import bisq.core.locale.FiatCurrency; -import bisq.core.payment.payload.JapanBankAccountPayload; public final class JapanBankAccount extends PaymentAccount { diff --git a/core/src/main/java/bisq/core/support/SupportSession.java b/core/src/main/java/bisq/core/support/SupportSession.java index 0354ddba7f5..c2e3c26c215 100644 --- a/core/src/main/java/bisq/core/support/SupportSession.java +++ b/core/src/main/java/bisq/core/support/SupportSession.java @@ -19,8 +19,6 @@ import bisq.core.support.messages.ChatMessage; -import bisq.common.crypto.PubKeyRing; - import javafx.collections.ObservableList; /** diff --git a/core/src/main/java/bisq/core/support/dispute/DisputeSession.java b/core/src/main/java/bisq/core/support/dispute/DisputeSession.java index d381a0eaaf6..d454d2c57a9 100644 --- a/core/src/main/java/bisq/core/support/dispute/DisputeSession.java +++ b/core/src/main/java/bisq/core/support/dispute/DisputeSession.java @@ -20,8 +20,6 @@ import bisq.core.support.SupportSession; import bisq.core.support.messages.ChatMessage; -import bisq.common.crypto.PubKeyRing; - import javafx.collections.FXCollections; import javafx.collections.ObservableList; diff --git a/core/src/main/java/bisq/core/trade/model/bisq_v1/SellerTrade.java b/core/src/main/java/bisq/core/trade/model/bisq_v1/SellerTrade.java index fd1bf5345e7..5ca869abeed 100644 --- a/core/src/main/java/bisq/core/trade/model/bisq_v1/SellerTrade.java +++ b/core/src/main/java/bisq/core/trade/model/bisq_v1/SellerTrade.java @@ -18,7 +18,6 @@ package bisq.core.trade.model.bisq_v1; import bisq.core.btc.wallet.BtcWalletService; -import bisq.core.locale.CurrencyUtil; import bisq.core.offer.Offer; import bisq.core.trade.protocol.bisq_v1.model.ProcessModel; diff --git a/core/src/test/java/bisq/core/util/FormattingUtilsTest.java b/core/src/test/java/bisq/core/util/FormattingUtilsTest.java index 76f5a46e0b7..c7f0a4f1b60 100644 --- a/core/src/test/java/bisq/core/util/FormattingUtilsTest.java +++ b/core/src/test/java/bisq/core/util/FormattingUtilsTest.java @@ -1,7 +1,6 @@ package bisq.core.util; import bisq.core.locale.Res; -import bisq.core.monetary.Altcoin; import bisq.core.monetary.Price; import org.bitcoinj.utils.Fiat; @@ -9,7 +8,6 @@ import java.util.Locale; import java.util.concurrent.TimeUnit; -import com.natpryce.makeiteasy.Instantiator; import com.natpryce.makeiteasy.Maker; import com.natpryce.makeiteasy.Property; diff --git a/desktop/src/main/java/bisq/desktop/components/InfoTextField.java b/desktop/src/main/java/bisq/desktop/components/InfoTextField.java index fe253b2f2b8..4d4e6af5945 100644 --- a/desktop/src/main/java/bisq/desktop/components/InfoTextField.java +++ b/desktop/src/main/java/bisq/desktop/components/InfoTextField.java @@ -19,8 +19,6 @@ import bisq.desktop.components.controlsfx.control.PopOver; -import bisq.common.UserThread; - import de.jensd.fx.fontawesome.AwesomeIcon; import de.jensd.fx.glyphs.materialdesignicons.MaterialDesignIcon; diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/AchTransferForm.java b/desktop/src/main/java/bisq/desktop/components/paymentmethods/AchTransferForm.java index e2242044715..7147a3b09f3 100644 --- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/AchTransferForm.java +++ b/desktop/src/main/java/bisq/desktop/components/paymentmethods/AchTransferForm.java @@ -53,8 +53,8 @@ public AchTransferForm(PaymentAccount paymentAccount, AccountAgeWitnessService a } @Override - public void addFormForDisplayAccount() { - addFormForDisplayAccount(achTransferAccount.getPayload(), achTransferAccount.getPayload().getHolderAddress()); + public void addFormForEditAccount() { + addFormForEditAccount(achTransferAccount.getPayload(), achTransferAccount.getPayload().getHolderAddress()); } @Override diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/AdvancedCashForm.java b/desktop/src/main/java/bisq/desktop/components/paymentmethods/AdvancedCashForm.java index caf34bdf327..d21b13dc7b3 100644 --- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/AdvancedCashForm.java +++ b/desktop/src/main/java/bisq/desktop/components/paymentmethods/AdvancedCashForm.java @@ -19,7 +19,6 @@ import bisq.desktop.components.InputTextField; import bisq.desktop.util.FormBuilder; -import bisq.desktop.util.Layout; import bisq.desktop.util.validation.AdvancedCashValidator; import bisq.core.account.witness.AccountAgeWitnessService; @@ -38,20 +37,14 @@ import javafx.scene.layout.FlowPane; import javafx.scene.layout.GridPane; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import static bisq.desktop.util.FormBuilder.addCompactTopLabelTextField; import static bisq.desktop.util.FormBuilder.addCompactTopLabelTextFieldWithCopyIcon; import static bisq.desktop.util.FormBuilder.addTopLabelFlowPane; @Deprecated public class AdvancedCashForm extends PaymentMethodForm { - private static final Logger log = LoggerFactory.getLogger(AdvancedCashForm.class); - private final AdvancedCashAccount advancedCashAccount; private final AdvancedCashValidator advancedCashValidator; - private InputTextField accountNrInputTextField; public static int addFormForBuyer(GridPane gridPane, int gridRow, PaymentAccountPayload paymentAccountPayload) { @@ -76,7 +69,7 @@ public AdvancedCashForm(PaymentAccount paymentAccount, public void addFormForAddAccount() { gridRowFrom = gridRow + 1; - accountNrInputTextField = FormBuilder.addInputTextField(gridPane, ++gridRow, Res.get("payment.wallet")); + InputTextField accountNrInputTextField = FormBuilder.addInputTextField(gridPane, ++gridRow, Res.get("payment.wallet")); accountNrInputTextField.setValidator(advancedCashValidator); accountNrInputTextField.textProperty().addListener((ov, oldValue, newValue) -> { advancedCashAccount.setAccountNr(newValue); @@ -104,14 +97,13 @@ private void addCurrenciesGrid(boolean isEditable) { @Override protected void autoFillNameTextField() { - setAccountNameWithString(accountNrInputTextField.getText()); + setAccountNameWithString(advancedCashAccount.getAccountNr()); } @Override - public void addFormForDisplayAccount() { + public void addFormForEditAccount() { gridRowFrom = gridRow; - addCompactTopLabelTextField(gridPane, gridRow, Res.get("payment.account.name"), - advancedCashAccount.getAccountName(), Layout.FIRST_ROW_AND_GROUP_DISTANCE); + addAccountNameTextFieldWithAutoFillToggleButton(); addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("shared.paymentMethod"), Res.get(advancedCashAccount.getPaymentMethod().getId())); addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.wallet"), diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/AmazonGiftCardForm.java b/desktop/src/main/java/bisq/desktop/components/paymentmethods/AmazonGiftCardForm.java index 9694510fdec..93453d5ff7a 100644 --- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/AmazonGiftCardForm.java +++ b/desktop/src/main/java/bisq/desktop/components/paymentmethods/AmazonGiftCardForm.java @@ -30,7 +30,6 @@ import bisq.core.payment.PaymentAccount; import bisq.core.payment.payload.AmazonGiftCardAccountPayload; import bisq.core.payment.payload.PaymentAccountPayload; -import bisq.core.payment.payload.PaymentMethod; import bisq.core.util.coin.CoinFormatter; import bisq.core.util.validation.InputValidator; @@ -50,7 +49,6 @@ @Slf4j public class AmazonGiftCardForm extends PaymentMethodForm { - private InputTextField accountNrInputTextField; ComboBox countryCombo; private final AmazonGiftCardAccount amazonGiftCardAccount; @@ -87,7 +85,7 @@ public AmazonGiftCardForm(PaymentAccount paymentAccount, public void addFormForAddAccount() { gridRowFrom = gridRow + 1; - accountNrInputTextField = addInputTextField(gridPane, ++gridRow, Res.get("payment.email.mobile")); + InputTextField accountNrInputTextField = addInputTextField(gridPane, ++gridRow, Res.get("payment.email.mobile")); accountNrInputTextField.setValidator(inputValidator); accountNrInputTextField.textProperty().addListener((ov, oldValue, newValue) -> { amazonGiftCardAccount.setEmailOrMobileNr(newValue); @@ -123,44 +121,34 @@ public Country fromString(String s) { @Override protected void autoFillNameTextField() { - setAccountNameWithString(accountNrInputTextField.getText()); + setAccountNameWithString(amazonGiftCardAccount.getEmailOrMobileNr()); } @Override - public void addFormForDisplayAccount() { - addFormForAccountNumberDisplayAccount(paymentAccount.getAccountName(), paymentAccount.getPaymentMethod(), - amazonGiftCardAccount.getEmailOrMobileNr(), - paymentAccount.getSingleTradeCurrency()); - } - - @Override - public void updateAllInputsValid() { - allInputsValid.set(isAccountNameValid() - && inputValidator.validate(amazonGiftCardAccount.getEmailOrMobileNr()).isValid - && paymentAccount.getTradeCurrencies().size() > 0); - } - - private void addFormForAccountNumberDisplayAccount(String accountName, - PaymentMethod paymentMethod, - String accountNr, - TradeCurrency singleTradeCurrency) { + public void addFormForEditAccount() { gridRowFrom = gridRow; - addTopLabelTextField(gridPane, gridRow, Res.get("payment.account.name"), accountName, - Layout.FIRST_ROW_AND_GROUP_DISTANCE); + addAccountNameTextFieldWithAutoFillToggleButton(); addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("shared.paymentMethod"), - Res.get(paymentMethod.getId())); + Res.get(paymentAccount.getPaymentMethod().getId())); TextField field = addCompactTopLabelTextField(gridPane, ++gridRow, - Res.get("payment.email.mobile"), accountNr).second; + Res.get("payment.email.mobile"), amazonGiftCardAccount.getEmailOrMobileNr()).second; field.setMouseTransparent(false); addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.country"), amazonGiftCardAccount.getCountry() != null ? amazonGiftCardAccount.getCountry().name : ""); - String nameAndCode = singleTradeCurrency != null ? singleTradeCurrency.getNameAndCode() : ""; + String nameAndCode = paymentAccount.getSingleTradeCurrency() != null ? paymentAccount.getSingleTradeCurrency().getNameAndCode() : ""; addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("shared.currency"), nameAndCode); addLimitations(true); } + @Override + public void updateAllInputsValid() { + allInputsValid.set(isAccountNameValid() + && inputValidator.validate(amazonGiftCardAccount.getEmailOrMobileNr()).isValid + && paymentAccount.getTradeCurrencies().size() > 0); + } + private static String countryToAmazonSite(String countryCode) { HashMap mapCountryToSite = new HashMap<>() {{ put("AU", "https://www.amazon.au"); diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/AssetsForm.java b/desktop/src/main/java/bisq/desktop/components/paymentmethods/AssetsForm.java index 30f32c9ee52..8c30cd1ea1b 100644 --- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/AssetsForm.java +++ b/desktop/src/main/java/bisq/desktop/components/paymentmethods/AssetsForm.java @@ -55,7 +55,6 @@ import static bisq.desktop.util.FormBuilder.addCompactTopLabelTextField; import static bisq.desktop.util.FormBuilder.addCompactTopLabelTextFieldWithCopyIcon; import static bisq.desktop.util.FormBuilder.addLabelCheckBox; -import static bisq.desktop.util.FormBuilder.addTopLabelTextField; import static bisq.desktop.util.GUIUtil.getComboBoxButtonCell; public class AssetsForm extends PaymentMethodForm { @@ -166,15 +165,14 @@ public void updateFromInputs() { @Override protected void autoFillNameTextField() { if (useCustomAccountNameToggleButton != null && !useCustomAccountNameToggleButton.isSelected()) { - accountNameTextField.setText(createAssetsAccountName(paymentAccount, addressInputTextField.getText())); + accountNameTextField.setText(createAssetsAccountName(paymentAccount, assetAccount.getAddress())); } } @Override - public void addFormForDisplayAccount() { + public void addFormForEditAccount() { gridRowFrom = gridRow; - addTopLabelTextField(gridPane, gridRow, Res.get("payment.account.name"), - assetAccount.getAccountName(), Layout.FIRST_ROW_AND_GROUP_DISTANCE); + addAccountNameTextFieldWithAutoFillToggleButton(); addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("shared.paymentMethod"), Res.get(assetAccount.getPaymentMethod().getId())); Tuple3 tuple2 = addCompactTopLabelTextField(gridPane, ++gridRow, diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/AustraliaPayidForm.java b/desktop/src/main/java/bisq/desktop/components/paymentmethods/AustraliaPayidForm.java index a1d6337ea84..8dda9f1da66 100644 --- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/AustraliaPayidForm.java +++ b/desktop/src/main/java/bisq/desktop/components/paymentmethods/AustraliaPayidForm.java @@ -19,7 +19,6 @@ import bisq.desktop.components.InputTextField; import bisq.desktop.util.FormBuilder; -import bisq.desktop.util.Layout; import bisq.desktop.util.validation.AustraliaPayidValidator; import bisq.core.account.witness.AccountAgeWitnessService; @@ -41,7 +40,6 @@ public class AustraliaPayidForm extends PaymentMethodForm { private final AustraliaPayid australiaPayid; private final AustraliaPayidValidator australiaPayidValidator; - private InputTextField mobileNrInputTextField; public static int addFormForBuyer(GridPane gridPane, int gridRow, PaymentAccountPayload paymentAccountPayload) { addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.account.owner"), @@ -75,7 +73,7 @@ public void addFormForAddAccount() { updateFromInputs(); }); - mobileNrInputTextField = FormBuilder.addInputTextField(gridPane, ++gridRow, Res.get("payment.payid")); + InputTextField mobileNrInputTextField = FormBuilder.addInputTextField(gridPane, ++gridRow, Res.get("payment.payid")); mobileNrInputTextField.setValidator(australiaPayidValidator); mobileNrInputTextField.textProperty().addListener((ov, oldValue, newValue) -> { australiaPayid.setPayid(newValue); @@ -91,14 +89,13 @@ public void addFormForAddAccount() { @Override protected void autoFillNameTextField() { - setAccountNameWithString(mobileNrInputTextField.getText()); + setAccountNameWithString(australiaPayid.getPayid()); } @Override - public void addFormForDisplayAccount() { + public void addFormForEditAccount() { gridRowFrom = gridRow; - addTopLabelTextField(gridPane, gridRow, Res.get("payment.account.name"), - australiaPayid.getAccountName(), Layout.FIRST_ROW_AND_GROUP_DISTANCE); + addAccountNameTextFieldWithAutoFillToggleButton(); addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("shared.paymentMethod"), Res.get(australiaPayid.getPaymentMethod().getId())); addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.payid"), diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/BankForm.java b/desktop/src/main/java/bisq/desktop/components/paymentmethods/BankForm.java index 15508227d3e..7ccb55821bf 100644 --- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/BankForm.java +++ b/desktop/src/main/java/bisq/desktop/components/paymentmethods/BankForm.java @@ -19,7 +19,6 @@ import bisq.desktop.components.InputTextField; import bisq.desktop.util.GUIUtil; -import bisq.desktop.util.Layout; import bisq.core.account.witness.AccountAgeWitnessService; import bisq.core.locale.BankUtil; @@ -173,12 +172,11 @@ static int addFormForBuyer(GridPane gridPane, int gridRow, PaymentAccountPayload } @Override - public void addFormForDisplayAccount() { + public void addFormForEditAccount() { gridRowFrom = gridRow; String countryCode = bankAccountPayload.getCountryCode(); - addTopLabelTextField(gridPane, gridRow, Res.get("payment.account.name"), - paymentAccount.getAccountName(), Layout.FIRST_ROW_AND_GROUP_DISTANCE); + addAccountNameTextFieldWithAutoFillToggleButton(); addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("shared.paymentMethod"), Res.get(paymentAccount.getPaymentMethod().getId())); addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.country"), diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/BizumForm.java b/desktop/src/main/java/bisq/desktop/components/paymentmethods/BizumForm.java index b7cbd5ffff5..bb1d8dc16cf 100644 --- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/BizumForm.java +++ b/desktop/src/main/java/bisq/desktop/components/paymentmethods/BizumForm.java @@ -41,7 +41,6 @@ public class BizumForm extends PaymentMethodForm { private final BizumAccount account; - private InputTextField mobileNrInputTextField; public static int addFormForBuyer(GridPane gridPane, int gridRow, PaymentAccountPayload paymentAccountPayload) { @@ -65,7 +64,7 @@ public void addFormForAddAccount() { gridRowFrom = gridRow + 1; - mobileNrInputTextField = FormBuilder.addInputTextField(gridPane, ++gridRow, Res.get("payment.mobile")); + InputTextField mobileNrInputTextField = FormBuilder.addInputTextField(gridPane, ++gridRow, Res.get("payment.mobile")); mobileNrInputTextField.setValidator(inputValidator); mobileNrInputTextField.textProperty().addListener((ov, oldValue, newValue) -> { account.setMobileNr(newValue.trim()); @@ -80,14 +79,13 @@ public void addFormForAddAccount() { @Override protected void autoFillNameTextField() { - setAccountNameWithString(mobileNrInputTextField.getText()); + setAccountNameWithString(account.getMobileNr()); } @Override - public void addFormForDisplayAccount() { + public void addFormForEditAccount() { gridRowFrom = gridRow; - addTopLabelTextField(gridPane, gridRow, Res.get("payment.account.name"), - account.getAccountName(), Layout.FIRST_ROW_AND_GROUP_DISTANCE); + addAccountNameTextFieldWithAutoFillToggleButton(); addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("shared.paymentMethod"), Res.get(account.getPaymentMethod().getId())); TextField field = addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.mobile"), diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/CapitualForm.java b/desktop/src/main/java/bisq/desktop/components/paymentmethods/CapitualForm.java index 4f7201cc542..8b4991284cc 100644 --- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/CapitualForm.java +++ b/desktop/src/main/java/bisq/desktop/components/paymentmethods/CapitualForm.java @@ -19,7 +19,6 @@ import bisq.desktop.components.InputTextField; import bisq.desktop.util.FormBuilder; -import bisq.desktop.util.Layout; import bisq.desktop.util.validation.CapitualValidator; import bisq.core.account.witness.AccountAgeWitnessService; @@ -45,7 +44,6 @@ public class CapitualForm extends PaymentMethodForm { private final CapitualAccount capitualAccount; private final CapitualValidator capitualValidator; - private InputTextField accountNrInputTextField; public static int addFormForBuyer(GridPane gridPane, int gridRow, PaymentAccountPayload paymentAccountPayload) { @@ -70,7 +68,7 @@ public CapitualForm(PaymentAccount paymentAccount, public void addFormForAddAccount() { gridRowFrom = gridRow + 1; - accountNrInputTextField = FormBuilder.addInputTextField(gridPane, ++gridRow, Res.get("payment.capitual.cap")); + InputTextField accountNrInputTextField = FormBuilder.addInputTextField(gridPane, ++gridRow, Res.get("payment.capitual.cap")); accountNrInputTextField.setValidator(capitualValidator); accountNrInputTextField.textProperty().addListener((ov, oldValue, newValue) -> { capitualAccount.setAccountNr(newValue); @@ -98,14 +96,13 @@ private void addCurrenciesGrid(boolean isEditable) { @Override protected void autoFillNameTextField() { - setAccountNameWithString(accountNrInputTextField.getText()); + setAccountNameWithString(capitualAccount.getAccountNr()); } @Override - public void addFormForDisplayAccount() { + public void addFormForEditAccount() { gridRowFrom = gridRow; - addCompactTopLabelTextField(gridPane, gridRow, Res.get("payment.account.name"), - capitualAccount.getAccountName(), Layout.FIRST_ROW_AND_GROUP_DISTANCE); + addAccountNameTextFieldWithAutoFillToggleButton(); addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("shared.paymentMethod"), Res.get(capitualAccount.getPaymentMethod().getId())); addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.capitual.cap"), diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/CashByMailForm.java b/desktop/src/main/java/bisq/desktop/components/paymentmethods/CashByMailForm.java index 37a8be1edca..5d50f2180be 100644 --- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/CashByMailForm.java +++ b/desktop/src/main/java/bisq/desktop/components/paymentmethods/CashByMailForm.java @@ -42,7 +42,6 @@ public class CashByMailForm extends PaymentMethodForm { private final CashByMailAccount cashByMailAccount; private TextArea postalAddressTextArea; - private InputTextField contactField; public static int addFormForBuyer(GridPane gridPane, int gridRow, PaymentAccountPayload paymentAccountPayload) { @@ -78,7 +77,7 @@ public void addFormForAddAccount() { addTradeCurrencyComboBox(); currencyComboBox.setItems(FXCollections.observableArrayList(CurrencyUtil.getAllSortedFiatCurrencies())); - contactField = addInputTextField(gridPane, ++gridRow, + InputTextField contactField = addInputTextField(gridPane, ++gridRow, Res.get("payment.cashByMail.contact")); contactField.setPromptText(Res.get("payment.cashByMail.contact.prompt")); contactField.setValidator(inputValidator); @@ -110,14 +109,13 @@ public void addFormForAddAccount() { @Override protected void autoFillNameTextField() { - setAccountNameWithString(contactField.getText()); + setAccountNameWithString(cashByMailAccount.getContact()); } @Override - public void addFormForDisplayAccount() { + public void addFormForEditAccount() { gridRowFrom = gridRow; - addTopLabelTextField(gridPane, gridRow, Res.get("payment.account.name"), - cashByMailAccount.getAccountName(), Layout.FIRST_ROW_AND_GROUP_DISTANCE); + addAccountNameTextFieldWithAutoFillToggleButton(); addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("shared.paymentMethod"), Res.get(cashByMailAccount.getPaymentMethod().getId())); diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/CashDepositForm.java b/desktop/src/main/java/bisq/desktop/components/paymentmethods/CashDepositForm.java index c48f20d77aa..5495cc7aa40 100644 --- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/CashDepositForm.java +++ b/desktop/src/main/java/bisq/desktop/components/paymentmethods/CashDepositForm.java @@ -19,7 +19,6 @@ import bisq.desktop.components.InputTextField; import bisq.desktop.util.GUIUtil; -import bisq.desktop.util.Layout; import bisq.desktop.util.validation.EmailValidator; import bisq.core.account.witness.AccountAgeWitnessService; @@ -190,11 +189,11 @@ public CashDepositForm(PaymentAccount paymentAccount, AccountAgeWitnessService a } @Override - public void addFormForDisplayAccount() { + public void addFormForEditAccount() { gridRowFrom = gridRow; String countryCode = cashDepositAccountPayload.getCountryCode(); - addTopLabelTextField(gridPane, gridRow, Res.get("payment.account.name"), paymentAccount.getAccountName(), Layout.FIRST_ROW_AND_GROUP_DISTANCE); + addAccountNameTextFieldWithAutoFillToggleButton(); addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("shared.paymentMethod"), Res.get(paymentAccount.getPaymentMethod().getId())); addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.country"), diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/CelPayForm.java b/desktop/src/main/java/bisq/desktop/components/paymentmethods/CelPayForm.java index db518b482d5..afa625f2b89 100644 --- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/CelPayForm.java +++ b/desktop/src/main/java/bisq/desktop/components/paymentmethods/CelPayForm.java @@ -19,16 +19,15 @@ import bisq.desktop.components.InputTextField; import bisq.desktop.util.FormBuilder; -import bisq.desktop.util.Layout; import bisq.desktop.util.validation.EmailValidator; import bisq.core.account.witness.AccountAgeWitnessService; import bisq.core.locale.CurrencyUtil; import bisq.core.locale.Res; -import bisq.core.payment.PaymentAccount; import bisq.core.payment.CelPayAccount; -import bisq.core.payment.payload.PaymentAccountPayload; +import bisq.core.payment.PaymentAccount; import bisq.core.payment.payload.CelPayAccountPayload; +import bisq.core.payment.payload.PaymentAccountPayload; import bisq.core.util.coin.CoinFormatter; import bisq.core.util.validation.InputValidator; @@ -38,12 +37,10 @@ import static bisq.desktop.util.FormBuilder.addCompactTopLabelTextField; import static bisq.desktop.util.FormBuilder.addCompactTopLabelTextFieldWithCopyIcon; -import static bisq.desktop.util.FormBuilder.addTopLabelTextField; public class CelPayForm extends PaymentMethodForm { private final CelPayAccount account; - private InputTextField emailInputTextField; - private EmailValidator validator = new EmailValidator(); + private final EmailValidator validator = new EmailValidator(); public static int addFormForBuyer(GridPane gridPane, int gridRow, PaymentAccountPayload paymentAccountPayload) { @@ -63,7 +60,7 @@ public CelPayForm(PaymentAccount paymentAccount, AccountAgeWitnessService accoun public void addFormForAddAccount() { gridRowFrom = gridRow + 1; - emailInputTextField = FormBuilder.addInputTextField(gridPane, ++gridRow, Res.get("payment.email")); + InputTextField emailInputTextField = FormBuilder.addInputTextField(gridPane, ++gridRow, Res.get("payment.email")); emailInputTextField.setValidator(validator); emailInputTextField.textProperty().addListener((ov, oldValue, newValue) -> { account.setEmail(newValue.trim()); @@ -91,14 +88,13 @@ private void addCurrenciesGrid(boolean isEditable) { @Override protected void autoFillNameTextField() { - setAccountNameWithString(emailInputTextField.getText()); + setAccountNameWithString(account.getEmail()); } @Override - public void addFormForDisplayAccount() { + public void addFormForEditAccount() { gridRowFrom = gridRow; - addTopLabelTextField(gridPane, gridRow, Res.get("payment.account.name"), - account.getAccountName(), Layout.FIRST_ROW_AND_GROUP_DISTANCE); + addAccountNameTextFieldWithAutoFillToggleButton(); addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("shared.paymentMethod"), Res.get(account.getPaymentMethod().getId())); TextField field = addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.email"), diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/ChaseQuickPayForm.java b/desktop/src/main/java/bisq/desktop/components/paymentmethods/ChaseQuickPayForm.java index 67e7337ccc4..7c3485aa44f 100644 --- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/ChaseQuickPayForm.java +++ b/desktop/src/main/java/bisq/desktop/components/paymentmethods/ChaseQuickPayForm.java @@ -19,7 +19,6 @@ import bisq.desktop.components.InputTextField; import bisq.desktop.util.FormBuilder; -import bisq.desktop.util.Layout; import bisq.desktop.util.validation.ChaseQuickPayValidator; import bisq.core.account.witness.AccountAgeWitnessService; @@ -42,7 +41,6 @@ public class ChaseQuickPayForm extends PaymentMethodForm { private final ChaseQuickPayAccount chaseQuickPayAccount; private final ChaseQuickPayValidator chaseQuickPayValidator; - private InputTextField mobileNrInputTextField; public static int addFormForBuyer(GridPane gridPane, int gridRow, PaymentAccountPayload paymentAccountPayload) { addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.account.owner"), @@ -71,7 +69,7 @@ public void addFormForAddAccount() { updateFromInputs(); }); - mobileNrInputTextField = FormBuilder.addInputTextField(gridPane, ++gridRow, Res.get("payment.email")); + InputTextField mobileNrInputTextField = FormBuilder.addInputTextField(gridPane, ++gridRow, Res.get("payment.email")); mobileNrInputTextField.setValidator(chaseQuickPayValidator); mobileNrInputTextField.textProperty().addListener((ov, oldValue, newValue) -> { chaseQuickPayAccount.setEmail(newValue); @@ -87,14 +85,13 @@ public void addFormForAddAccount() { @Override protected void autoFillNameTextField() { - setAccountNameWithString(mobileNrInputTextField.getText()); + setAccountNameWithString(chaseQuickPayAccount.getEmail()); } @Override - public void addFormForDisplayAccount() { + public void addFormForEditAccount() { gridRowFrom = gridRow; - addTopLabelTextField(gridPane, gridRow, Res.get("payment.account.name"), - chaseQuickPayAccount.getAccountName(), Layout.FIRST_ROW_AND_GROUP_DISTANCE); + addAccountNameTextFieldWithAutoFillToggleButton(); addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("shared.paymentMethod"), Res.get(chaseQuickPayAccount.getPaymentMethod().getId())); addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.account.owner"), diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/ClearXchangeForm.java b/desktop/src/main/java/bisq/desktop/components/paymentmethods/ClearXchangeForm.java index 72ecbd4911c..bfaec6d1d83 100644 --- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/ClearXchangeForm.java +++ b/desktop/src/main/java/bisq/desktop/components/paymentmethods/ClearXchangeForm.java @@ -19,7 +19,6 @@ import bisq.desktop.components.InputTextField; import bisq.desktop.util.FormBuilder; -import bisq.desktop.util.Layout; import bisq.desktop.util.validation.ClearXchangeValidator; import bisq.core.account.witness.AccountAgeWitnessService; @@ -42,7 +41,6 @@ public class ClearXchangeForm extends PaymentMethodForm { private final ClearXchangeAccount clearXchangeAccount; private final ClearXchangeValidator clearXchangeValidator; - private InputTextField mobileNrInputTextField; public static int addFormForBuyer(GridPane gridPane, int gridRow, PaymentAccountPayload paymentAccountPayload) { addCompactTopLabelTextFieldWithCopyIcon(gridPane, ++gridRow, Res.get("payment.account.owner"), @@ -70,7 +68,7 @@ public void addFormForAddAccount() { updateFromInputs(); }); - mobileNrInputTextField = FormBuilder.addInputTextField(gridPane, ++gridRow, + InputTextField mobileNrInputTextField = FormBuilder.addInputTextField(gridPane, ++gridRow, Res.get("payment.email.mobile")); mobileNrInputTextField.setValidator(clearXchangeValidator); mobileNrInputTextField.textProperty().addListener((ov, oldValue, newValue) -> { @@ -87,14 +85,13 @@ public void addFormForAddAccount() { @Override protected void autoFillNameTextField() { - setAccountNameWithString(mobileNrInputTextField.getText()); + setAccountNameWithString(clearXchangeAccount.getEmailOrMobileNr()); } @Override - public void addFormForDisplayAccount() { + public void addFormForEditAccount() { gridRowFrom = gridRow; - addTopLabelTextField(gridPane, gridRow, Res.get("payment.account.name"), - clearXchangeAccount.getAccountName(), Layout.FIRST_ROW_AND_GROUP_DISTANCE); + addAccountNameTextFieldWithAutoFillToggleButton(); addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("shared.paymentMethod"), Res.get(clearXchangeAccount.getPaymentMethod().getId())); addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.account.owner"), diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/DomesticWireTransferForm.java b/desktop/src/main/java/bisq/desktop/components/paymentmethods/DomesticWireTransferForm.java index a4c3f920340..793d30bf538 100644 --- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/DomesticWireTransferForm.java +++ b/desktop/src/main/java/bisq/desktop/components/paymentmethods/DomesticWireTransferForm.java @@ -47,8 +47,8 @@ public DomesticWireTransferForm(PaymentAccount paymentAccount, AccountAgeWitness } @Override - public void addFormForDisplayAccount() { - addFormForDisplayAccount(domesticWireTransferAccount.getPayload(), domesticWireTransferAccount.getPayload().getHolderAddress()); + public void addFormForEditAccount() { + addFormForEditAccount(domesticWireTransferAccount.getPayload(), domesticWireTransferAccount.getPayload().getHolderAddress()); } @Override diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/F2FForm.java b/desktop/src/main/java/bisq/desktop/components/paymentmethods/F2FForm.java index cc338ad6733..7cd1d3b153e 100644 --- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/F2FForm.java +++ b/desktop/src/main/java/bisq/desktop/components/paymentmethods/F2FForm.java @@ -18,9 +18,7 @@ package bisq.desktop.components.paymentmethods; import bisq.desktop.components.InputTextField; -import bisq.desktop.util.FormBuilder; import bisq.desktop.util.GUIUtil; -import bisq.desktop.util.Layout; import bisq.desktop.util.validation.F2FValidator; import bisq.core.account.witness.AccountAgeWitnessService; @@ -52,7 +50,6 @@ public class F2FForm extends PaymentMethodForm { private final F2FAccount f2fAccount; private final F2FValidator f2fValidator; - private InputTextField cityInputTextField; private Country selectedCountry; public static int addFormForBuyer(GridPane gridPane, int gridRow, @@ -90,7 +87,7 @@ public void addFormForAddAccount() { currencyComboBox = tuple.first; gridRow = tuple.second; - InputTextField contactInputTextField = FormBuilder.addInputTextField(gridPane, ++gridRow, + InputTextField contactInputTextField = addInputTextField(gridPane, ++gridRow, Res.get("payment.f2f.contact")); contactInputTextField.setPromptText(Res.get("payment.f2f.contact.prompt")); contactInputTextField.setValidator(f2fValidator); @@ -99,7 +96,7 @@ public void addFormForAddAccount() { updateFromInputs(); }); - cityInputTextField = FormBuilder.addInputTextField(gridPane, ++gridRow, + InputTextField cityInputTextField = addInputTextField(gridPane, ++gridRow, Res.get("payment.f2f.city")); cityInputTextField.setPromptText(Res.get("payment.f2f.city.prompt")); cityInputTextField.setValidator(f2fValidator); @@ -143,15 +140,14 @@ private void onTradeCurrencySelected(TradeCurrency tradeCurrency) { @Override protected void autoFillNameTextField() { - setAccountNameWithString(cityInputTextField.getText()); + setAccountNameWithString(f2fAccount.getCity()); } @Override - public void addFormForDisplayAccount() { + public void addFormForEditAccount() { gridRowFrom = gridRow; - addTopLabelTextField(gridPane, gridRow, Res.get("payment.account.name"), - paymentAccount.getAccountName(), Layout.FIRST_ROW_AND_GROUP_DISTANCE); + addAccountNameTextFieldWithAutoFillToggleButton(); addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("shared.paymentMethod"), Res.get(paymentAccount.getPaymentMethod().getId())); addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.country"), diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/FasterPaymentsForm.java b/desktop/src/main/java/bisq/desktop/components/paymentmethods/FasterPaymentsForm.java index e431b1ce7ef..4e3325f6891 100644 --- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/FasterPaymentsForm.java +++ b/desktop/src/main/java/bisq/desktop/components/paymentmethods/FasterPaymentsForm.java @@ -19,7 +19,6 @@ import bisq.desktop.components.InputTextField; import bisq.desktop.util.FormBuilder; -import bisq.desktop.util.Layout; import bisq.desktop.util.validation.AccountNrValidator; import bisq.desktop.util.validation.BranchIdValidator; @@ -108,14 +107,13 @@ public void addFormForAddAccount() { @Override protected void autoFillNameTextField() { - setAccountNameWithString(accountNrInputTextField.getText()); + setAccountNameWithString(fasterPaymentsAccount.getAccountNr()); } @Override - public void addFormForDisplayAccount() { + public void addFormForEditAccount() { gridRowFrom = gridRow; - addTopLabelTextField(gridPane, gridRow, Res.get("payment.account.name"), - fasterPaymentsAccount.getAccountName(), Layout.FIRST_ROW_AND_GROUP_DISTANCE); + addAccountNameTextFieldWithAutoFillToggleButton(); addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("shared.paymentMethod"), Res.get(fasterPaymentsAccount.getPaymentMethod().getId())); if (!fasterPaymentsAccount.getHolderName().isEmpty()) { diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/GeneralAccountNumberForm.java b/desktop/src/main/java/bisq/desktop/components/paymentmethods/GeneralAccountNumberForm.java index 8d620a09962..249813e871c 100644 --- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/GeneralAccountNumberForm.java +++ b/desktop/src/main/java/bisq/desktop/components/paymentmethods/GeneralAccountNumberForm.java @@ -1,13 +1,11 @@ package bisq.desktop.components.paymentmethods; import bisq.desktop.components.InputTextField; -import bisq.desktop.util.Layout; import bisq.core.account.witness.AccountAgeWitnessService; import bisq.core.locale.Res; import bisq.core.locale.TradeCurrency; import bisq.core.payment.PaymentAccount; -import bisq.core.payment.payload.PaymentMethod; import bisq.core.util.coin.CoinFormatter; import bisq.core.util.validation.InputValidator; @@ -20,8 +18,6 @@ public abstract class GeneralAccountNumberForm extends PaymentMethodForm { - private InputTextField accountNrInputTextField; - GeneralAccountNumberForm(PaymentAccount paymentAccount, AccountAgeWitnessService accountAgeWitnessService, InputValidator inputValidator, GridPane gridPane, int gridRow, CoinFormatter formatter) { super(paymentAccount, accountAgeWitnessService, inputValidator, gridPane, gridRow, formatter); } @@ -30,7 +26,7 @@ public abstract class GeneralAccountNumberForm extends PaymentMethodForm { public void addFormForAddAccount() { gridRowFrom = gridRow + 1; - accountNrInputTextField = addInputTextField(gridPane, ++gridRow, Res.get("payment.account.no")); + InputTextField accountNrInputTextField = addInputTextField(gridPane, ++gridRow, Res.get("payment.account.no")); accountNrInputTextField.setValidator(inputValidator); accountNrInputTextField.textProperty().addListener((ov, oldValue, newValue) -> { setAccountNumber(newValue); @@ -51,13 +47,21 @@ public void addTradeCurrency() { @Override protected void autoFillNameTextField() { - setAccountNameWithString(accountNrInputTextField.getText()); + setAccountNameWithString(getAccountNr()); } @Override - public void addFormForDisplayAccount() { - addFormForAccountNumberDisplayAccount(paymentAccount.getAccountName(), paymentAccount.getPaymentMethod(), getAccountNr(), - paymentAccount.getSingleTradeCurrency()); + public void addFormForEditAccount() { + gridRowFrom = gridRow; + addAccountNameTextFieldWithAutoFillToggleButton(); + addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("shared.paymentMethod"), Res.get(paymentAccount.getPaymentMethod().getId())); + TextField field = addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.account.no"), getAccountNr()).second; + field.setMouseTransparent(false); + + final String nameAndCode = paymentAccount.getSingleTradeCurrency() != null ? paymentAccount.getSingleTradeCurrency().getNameAndCode() : ""; + addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("shared.currency"), nameAndCode); + + addLimitations(true); } @@ -71,18 +75,4 @@ public void updateAllInputsValid() { abstract void setAccountNumber(String newValue); abstract String getAccountNr(); - - private void addFormForAccountNumberDisplayAccount(String accountName, PaymentMethod paymentMethod, String accountNr, - TradeCurrency singleTradeCurrency) { - gridRowFrom = gridRow; - addTopLabelTextField(gridPane, gridRow, Res.get("payment.account.name"), accountName, Layout.FIRST_ROW_AND_GROUP_DISTANCE); - addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("shared.paymentMethod"), Res.get(paymentMethod.getId())); - TextField field = addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.account.no"), accountNr).second; - field.setMouseTransparent(false); - - final String nameAndCode = singleTradeCurrency != null ? singleTradeCurrency.getNameAndCode() : ""; - addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("shared.currency"), nameAndCode); - - addLimitations(true); - } } diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/GeneralUsBankForm.java b/desktop/src/main/java/bisq/desktop/components/paymentmethods/GeneralUsBankForm.java index 74d196a4a96..85c17ad6ec8 100644 --- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/GeneralUsBankForm.java +++ b/desktop/src/main/java/bisq/desktop/components/paymentmethods/GeneralUsBankForm.java @@ -82,10 +82,9 @@ public GeneralUsBankForm(PaymentAccount paymentAccount, AccountAgeWitnessService super(paymentAccount, accountAgeWitnessService, inputValidator, gridPane, gridRow, formatter); } - protected void addFormForDisplayAccount(BankAccountPayload bankAccountPayload, String holderAddress) { + protected void addFormForEditAccount(BankAccountPayload bankAccountPayload, String holderAddress) { Country country = ((CountryBasedPaymentAccount) paymentAccount).getCountry(); - addTopLabelTextField(gridPane, gridRow, Res.get("payment.account.name"), - paymentAccount.getAccountName(), Layout.FIRST_ROW_AND_GROUP_DISTANCE); + addAccountNameTextFieldWithAutoFillToggleButton(); addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("shared.paymentMethod"), Res.get(paymentAccount.getPaymentMethod().getId())); addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.account.owner"), bankAccountPayload.getHolderName()); diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/HalCashForm.java b/desktop/src/main/java/bisq/desktop/components/paymentmethods/HalCashForm.java index f0aa34ce70f..3e84ba9835c 100644 --- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/HalCashForm.java +++ b/desktop/src/main/java/bisq/desktop/components/paymentmethods/HalCashForm.java @@ -19,7 +19,6 @@ import bisq.desktop.components.InputTextField; import bisq.desktop.util.FormBuilder; -import bisq.desktop.util.Layout; import bisq.desktop.util.validation.HalCashValidator; import bisq.core.account.witness.AccountAgeWitnessService; @@ -41,7 +40,6 @@ public class HalCashForm extends PaymentMethodForm { private final HalCashAccount halCashAccount; private final HalCashValidator halCashValidator; - private InputTextField mobileNrInputTextField; public static int addFormForBuyer(GridPane gridPane, int gridRow, PaymentAccountPayload paymentAccountPayload) { @@ -61,7 +59,7 @@ public HalCashForm(PaymentAccount paymentAccount, AccountAgeWitnessService accou public void addFormForAddAccount() { gridRowFrom = gridRow + 1; - mobileNrInputTextField = FormBuilder.addInputTextField(gridPane, ++gridRow, + InputTextField mobileNrInputTextField = FormBuilder.addInputTextField(gridPane, ++gridRow, Res.get("payment.mobile")); mobileNrInputTextField.setValidator(halCashValidator); mobileNrInputTextField.textProperty().addListener((ov, oldValue, newValue) -> { @@ -78,14 +76,13 @@ public void addFormForAddAccount() { @Override protected void autoFillNameTextField() { - setAccountNameWithString(mobileNrInputTextField.getText()); + setAccountNameWithString(halCashAccount.getMobileNr()); } @Override - public void addFormForDisplayAccount() { + public void addFormForEditAccount() { gridRowFrom = gridRow; - addTopLabelTextField(gridPane, gridRow, Res.get("payment.account.name"), - halCashAccount.getAccountName(), Layout.FIRST_ROW_AND_GROUP_DISTANCE); + addAccountNameTextFieldWithAutoFillToggleButton(); addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("shared.paymentMethod"), Res.get(halCashAccount.getPaymentMethod().getId())); TextField field = addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.mobile"), diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/IfscBankForm.java b/desktop/src/main/java/bisq/desktop/components/paymentmethods/IfscBankForm.java index 1a29428c211..f8782b79a8b 100644 --- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/IfscBankForm.java +++ b/desktop/src/main/java/bisq/desktop/components/paymentmethods/IfscBankForm.java @@ -42,8 +42,7 @@ public class IfscBankForm extends PaymentMethodForm { private final IfscBasedAccountPayload ifscBasedAccountPayload; - private InputTextField holderNameInputTextField, accountNrInputTextField, ifscInputTextField; - private RegexValidator ifscValidator; // https://en.wikipedia.org/wiki/Indian_Financial_System_Code + private final RegexValidator ifscValidator; // https://en.wikipedia.org/wiki/Indian_Financial_System_Code public static int addFormForBuyer(GridPane gridPane, int gridRow, PaymentAccountPayload paymentAccountPayload) { @@ -72,7 +71,7 @@ public void addFormForAddAccount() { gridRowFrom = gridRow + 1; - holderNameInputTextField = FormBuilder.addInputTextField(gridPane, ++gridRow, + InputTextField holderNameInputTextField = FormBuilder.addInputTextField(gridPane, ++gridRow, Res.get("payment.account.owner")); holderNameInputTextField.setValidator(inputValidator); holderNameInputTextField.textProperty().addListener((ov, oldValue, newValue) -> { @@ -80,14 +79,14 @@ public void addFormForAddAccount() { updateFromInputs(); }); - accountNrInputTextField = FormBuilder.addInputTextField(gridPane, ++gridRow, Res.get("payment.accountNr")); + InputTextField accountNrInputTextField = FormBuilder.addInputTextField(gridPane, ++gridRow, Res.get("payment.accountNr")); accountNrInputTextField.setValidator(inputValidator); accountNrInputTextField.textProperty().addListener((ov, oldValue, newValue) -> { ifscBasedAccountPayload.setAccountNr(newValue.trim()); updateFromInputs(); }); - ifscInputTextField = FormBuilder.addInputTextField(gridPane, ++gridRow, Res.get("payment.ifsc")); + InputTextField ifscInputTextField = FormBuilder.addInputTextField(gridPane, ++gridRow, Res.get("payment.ifsc")); ifscInputTextField.setText("XXXX0999999"); ifscInputTextField.setValidator(ifscValidator); ifscInputTextField.textProperty().addListener((ov, oldValue, newValue) -> { @@ -103,13 +102,13 @@ public void addFormForAddAccount() { @Override protected void autoFillNameTextField() { - setAccountNameWithString(holderNameInputTextField.getText()); + setAccountNameWithString(ifscBasedAccountPayload.getHolderName()); } @Override - public void addFormForDisplayAccount() { + public void addFormForEditAccount() { gridRowFrom = gridRow; - addTopLabelTextField(gridPane, gridRow, Res.get("payment.account.name"), paymentAccount.getAccountName(), Layout.FIRST_ROW_AND_GROUP_DISTANCE); + addAccountNameTextFieldWithAutoFillToggleButton(); addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("shared.paymentMethod"), Res.get(paymentAccount.getPaymentMethod().getId())); addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.account.owner"), ifscBasedAccountPayload.getHolderName()); diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/InteracETransferForm.java b/desktop/src/main/java/bisq/desktop/components/paymentmethods/InteracETransferForm.java index 5a8fc6cea95..13145c24f1c 100644 --- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/InteracETransferForm.java +++ b/desktop/src/main/java/bisq/desktop/components/paymentmethods/InteracETransferForm.java @@ -19,7 +19,6 @@ import bisq.desktop.components.InputTextField; import bisq.desktop.util.FormBuilder; -import bisq.desktop.util.Layout; import bisq.desktop.util.validation.InteracETransferValidator; import bisq.core.account.witness.AccountAgeWitnessService; @@ -41,7 +40,6 @@ public class InteracETransferForm extends PaymentMethodForm { private final InteracETransferAccount interacETransferAccount; private final InteracETransferValidator interacETransferValidator; - private InputTextField mobileNrInputTextField; public static int addFormForBuyer(GridPane gridPane, int gridRow, PaymentAccountPayload paymentAccountPayload) { @@ -75,7 +73,7 @@ public void addFormForAddAccount() { updateFromInputs(); }); - mobileNrInputTextField = FormBuilder.addInputTextField(gridPane, ++gridRow, Res.get("payment.emailOrMobile")); + InputTextField mobileNrInputTextField = FormBuilder.addInputTextField(gridPane, ++gridRow, Res.get("payment.emailOrMobile")); mobileNrInputTextField.setValidator(interacETransferValidator); mobileNrInputTextField.textProperty().addListener((ov, oldValue, newValue) -> { interacETransferAccount.setEmail(newValue); @@ -105,14 +103,13 @@ public void addFormForAddAccount() { @Override protected void autoFillNameTextField() { - setAccountNameWithString(mobileNrInputTextField.getText()); + setAccountNameWithString(interacETransferAccount.getEmail()); } @Override - public void addFormForDisplayAccount() { + public void addFormForEditAccount() { gridRowFrom = gridRow; - addTopLabelTextField(gridPane, gridRow, Res.get("payment.account.name"), - interacETransferAccount.getAccountName(), Layout.FIRST_ROW_AND_GROUP_DISTANCE); + addAccountNameTextFieldWithAutoFillToggleButton(); addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("shared.paymentMethod"), Res.get(interacETransferAccount.getPaymentMethod().getId())); addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.account.owner"), diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/JapanBankTransferForm.java b/desktop/src/main/java/bisq/desktop/components/paymentmethods/JapanBankTransferForm.java index bfbde452b10..1b99a56d779 100644 --- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/JapanBankTransferForm.java +++ b/desktop/src/main/java/bisq/desktop/components/paymentmethods/JapanBankTransferForm.java @@ -20,7 +20,6 @@ import bisq.desktop.components.AutocompleteComboBox; import bisq.desktop.components.InputTextField; import bisq.desktop.components.paymentmethods.data.JapanBankData; -import bisq.desktop.util.Layout; import bisq.desktop.util.validation.JapanBankAccountNameValidator; import bisq.desktop.util.validation.JapanBankAccountNumberValidator; import bisq.desktop.util.validation.JapanBankBranchCodeValidator; @@ -101,11 +100,10 @@ public JapanBankTransferForm(PaymentAccount paymentAccount, } @Override - public void addFormForDisplayAccount() { + public void addFormForEditAccount() { gridRowFrom = gridRow; - addTopLabelTextField(gridPane, ++gridRow, Res.get("payment.account.name"), - japanBankAccount.getAccountName(), Layout.FIRST_ROW_AND_GROUP_DISTANCE); + addAccountNameTextFieldWithAutoFillToggleButton(); addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("shared.paymentMethod"), Res.get(japanBankAccount.getPaymentMethod().getId())); diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/MoneseForm.java b/desktop/src/main/java/bisq/desktop/components/paymentmethods/MoneseForm.java index 5b0b84f130b..ce32fd8beb7 100644 --- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/MoneseForm.java +++ b/desktop/src/main/java/bisq/desktop/components/paymentmethods/MoneseForm.java @@ -19,15 +19,14 @@ import bisq.desktop.components.InputTextField; import bisq.desktop.util.FormBuilder; -import bisq.desktop.util.Layout; import bisq.core.account.witness.AccountAgeWitnessService; import bisq.core.locale.CurrencyUtil; import bisq.core.locale.Res; -import bisq.core.payment.PaymentAccount; import bisq.core.payment.MoneseAccount; -import bisq.core.payment.payload.PaymentAccountPayload; +import bisq.core.payment.PaymentAccount; import bisq.core.payment.payload.MoneseAccountPayload; +import bisq.core.payment.payload.PaymentAccountPayload; import bisq.core.util.coin.CoinFormatter; import bisq.core.util.validation.InputValidator; @@ -36,12 +35,9 @@ import static bisq.desktop.util.FormBuilder.addCompactTopLabelTextField; import static bisq.desktop.util.FormBuilder.addCompactTopLabelTextFieldWithCopyIcon; -import static bisq.desktop.util.FormBuilder.addTopLabelTextField; public class MoneseForm extends PaymentMethodForm { private final MoneseAccount account; - private InputTextField holderNameInputTextField; - private InputTextField mobileNrInputTextField; public static int addFormForBuyer(GridPane gridPane, int gridRow, PaymentAccountPayload paymentAccountPayload) { @@ -63,14 +59,14 @@ public MoneseForm(PaymentAccount paymentAccount, AccountAgeWitnessService accoun public void addFormForAddAccount() { gridRowFrom = gridRow + 1; - holderNameInputTextField = FormBuilder.addInputTextField(gridPane, ++gridRow, Res.get("payment.account.owner")); + InputTextField holderNameInputTextField = FormBuilder.addInputTextField(gridPane, ++gridRow, Res.get("payment.account.owner")); holderNameInputTextField.setValidator(inputValidator); holderNameInputTextField.textProperty().addListener((ov, oldValue, newValue) -> { account.setHolderName(newValue.trim()); updateFromInputs(); }); - mobileNrInputTextField = FormBuilder.addInputTextField(gridPane, ++gridRow, Res.get("payment.mobile")); + InputTextField mobileNrInputTextField = FormBuilder.addInputTextField(gridPane, ++gridRow, Res.get("payment.mobile")); mobileNrInputTextField.setValidator(inputValidator); mobileNrInputTextField.textProperty().addListener((ov, oldValue, newValue) -> { account.setMobileNr(newValue.trim()); @@ -98,14 +94,13 @@ private void addCurrenciesGrid(boolean isEditable) { @Override protected void autoFillNameTextField() { - setAccountNameWithString(mobileNrInputTextField.getText()); + setAccountNameWithString(account.getMobileNr()); } @Override - public void addFormForDisplayAccount() { + public void addFormForEditAccount() { gridRowFrom = gridRow; - addTopLabelTextField(gridPane, gridRow, Res.get("payment.account.name"), - account.getAccountName(), Layout.FIRST_ROW_AND_GROUP_DISTANCE); + addAccountNameTextFieldWithAutoFillToggleButton(); addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("shared.paymentMethod"), Res.get(account.getPaymentMethod().getId())); addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.account.owner"), account.getHolderName()) diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/MoneyBeamForm.java b/desktop/src/main/java/bisq/desktop/components/paymentmethods/MoneyBeamForm.java index 6f20897395d..5e2e3f5eb92 100644 --- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/MoneyBeamForm.java +++ b/desktop/src/main/java/bisq/desktop/components/paymentmethods/MoneyBeamForm.java @@ -19,7 +19,6 @@ import bisq.desktop.components.InputTextField; import bisq.desktop.util.FormBuilder; -import bisq.desktop.util.Layout; import bisq.desktop.util.validation.MoneyBeamValidator; import bisq.core.account.witness.AccountAgeWitnessService; @@ -42,7 +41,6 @@ public class MoneyBeamForm extends PaymentMethodForm { private final MoneyBeamAccount account; private final MoneyBeamValidator validator; - private InputTextField accountIdInputTextField; public static int addFormForBuyer(GridPane gridPane, int gridRow, PaymentAccountPayload paymentAccountPayload) { addCompactTopLabelTextFieldWithCopyIcon(gridPane, ++gridRow, Res.get("payment.moneyBeam.accountId"), ((MoneyBeamAccountPayload) paymentAccountPayload).getAccountId()); @@ -59,7 +57,7 @@ public MoneyBeamForm(PaymentAccount paymentAccount, AccountAgeWitnessService acc public void addFormForAddAccount() { gridRowFrom = gridRow + 1; - accountIdInputTextField = FormBuilder.addInputTextField(gridPane, ++gridRow, Res.get("payment.moneyBeam.accountId")); + InputTextField accountIdInputTextField = FormBuilder.addInputTextField(gridPane, ++gridRow, Res.get("payment.moneyBeam.accountId")); accountIdInputTextField.setValidator(validator); accountIdInputTextField.textProperty().addListener((ov, oldValue, newValue) -> { account.setAccountId(newValue.trim()); @@ -75,13 +73,13 @@ public void addFormForAddAccount() { @Override protected void autoFillNameTextField() { - setAccountNameWithString(accountIdInputTextField.getText()); + setAccountNameWithString(account.getAccountId()); } @Override - public void addFormForDisplayAccount() { + public void addFormForEditAccount() { gridRowFrom = gridRow; - addTopLabelTextField(gridPane, gridRow, Res.get("payment.account.name"), account.getAccountName(), Layout.FIRST_ROW_AND_GROUP_DISTANCE); + addAccountNameTextFieldWithAutoFillToggleButton(); addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("shared.paymentMethod"), Res.get(account.getPaymentMethod().getId())); TextField field = addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.moneyBeam.accountId"), account.getAccountId()).second; field.setMouseTransparent(false); diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/MoneyGramForm.java b/desktop/src/main/java/bisq/desktop/components/paymentmethods/MoneyGramForm.java index f02e59dbada..a805c6c66d9 100644 --- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/MoneyGramForm.java +++ b/desktop/src/main/java/bisq/desktop/components/paymentmethods/MoneyGramForm.java @@ -67,7 +67,6 @@ public static int addFormForBuyer(GridPane gridPane, int gridRow, } private final MoneyGramAccountPayload moneyGramAccountPayload; - private InputTextField holderNameInputTextField; private InputTextField stateInputTextField; private final EmailValidator emailValidator; @@ -80,10 +79,10 @@ public MoneyGramForm(PaymentAccount paymentAccount, AccountAgeWitnessService acc } @Override - public void addFormForDisplayAccount() { + public void addFormForEditAccount() { gridRowFrom = gridRow; final Country country = getMoneyGramPaymentAccount().getCountry(); - addTopLabelTextField(gridPane, gridRow, Res.get("payment.account.name"), paymentAccount.getAccountName(), Layout.FIRST_ROW_AND_GROUP_DISTANCE); + addAccountNameTextFieldWithAutoFillToggleButton(); addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("shared.paymentMethod"), Res.get(paymentAccount.getPaymentMethod().getId())); addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.country"), country != null ? country.name : ""); @@ -104,7 +103,7 @@ public void addFormForAddAccount() { gridRow = GUIUtil.addRegionCountry(gridPane, gridRow, this::onCountrySelected); - holderNameInputTextField = addInputTextField(gridPane, + InputTextField holderNameInputTextField = addInputTextField(gridPane, ++gridRow, Res.get("payment.account.fullName")); holderNameInputTextField.textProperty().addListener((ov, oldValue, newValue) -> { moneyGramAccountPayload.setHolderName(newValue); @@ -170,7 +169,7 @@ private MoneyGramAccount getMoneyGramPaymentAccount() { @Override protected void autoFillNameTextField() { - setAccountNameWithString(holderNameInputTextField.getText()); + setAccountNameWithString(moneyGramAccountPayload.getHolderName()); } @Override diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/NequiForm.java b/desktop/src/main/java/bisq/desktop/components/paymentmethods/NequiForm.java index 91ca825dd38..8e9dbb2d7a8 100644 --- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/NequiForm.java +++ b/desktop/src/main/java/bisq/desktop/components/paymentmethods/NequiForm.java @@ -41,7 +41,6 @@ public class NequiForm extends PaymentMethodForm { private final NequiAccount account; - private InputTextField mobileNrInputTextField; public static int addFormForBuyer(GridPane gridPane, int gridRow, PaymentAccountPayload paymentAccountPayload) { @@ -65,7 +64,7 @@ public void addFormForAddAccount() { gridRowFrom = gridRow + 1; - mobileNrInputTextField = FormBuilder.addInputTextField(gridPane, ++gridRow, Res.get("payment.mobile")); + InputTextField mobileNrInputTextField = FormBuilder.addInputTextField(gridPane, ++gridRow, Res.get("payment.mobile")); mobileNrInputTextField.setValidator(inputValidator); mobileNrInputTextField.textProperty().addListener((ov, oldValue, newValue) -> { account.setMobileNr(newValue.trim()); @@ -80,14 +79,13 @@ public void addFormForAddAccount() { @Override protected void autoFillNameTextField() { - setAccountNameWithString(mobileNrInputTextField.getText()); + setAccountNameWithString(account.getMobileNr()); } @Override - public void addFormForDisplayAccount() { + public void addFormForEditAccount() { gridRowFrom = gridRow; - addTopLabelTextField(gridPane, gridRow, Res.get("payment.account.name"), - account.getAccountName(), Layout.FIRST_ROW_AND_GROUP_DISTANCE); + addAccountNameTextFieldWithAutoFillToggleButton(); addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("shared.paymentMethod"), Res.get(account.getPaymentMethod().getId())); TextField field = addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.mobile"), diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/PaxumForm.java b/desktop/src/main/java/bisq/desktop/components/paymentmethods/PaxumForm.java index 40c6349f320..a548c6db865 100644 --- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/PaxumForm.java +++ b/desktop/src/main/java/bisq/desktop/components/paymentmethods/PaxumForm.java @@ -19,16 +19,15 @@ import bisq.desktop.components.InputTextField; import bisq.desktop.util.FormBuilder; -import bisq.desktop.util.Layout; import bisq.desktop.util.validation.EmailValidator; import bisq.core.account.witness.AccountAgeWitnessService; import bisq.core.locale.CurrencyUtil; import bisq.core.locale.Res; -import bisq.core.payment.PaymentAccount; import bisq.core.payment.PaxumAccount; -import bisq.core.payment.payload.PaymentAccountPayload; +import bisq.core.payment.PaymentAccount; import bisq.core.payment.payload.PaxumAccountPayload; +import bisq.core.payment.payload.PaymentAccountPayload; import bisq.core.util.coin.CoinFormatter; import bisq.core.util.validation.InputValidator; @@ -38,12 +37,10 @@ import static bisq.desktop.util.FormBuilder.addCompactTopLabelTextField; import static bisq.desktop.util.FormBuilder.addCompactTopLabelTextFieldWithCopyIcon; -import static bisq.desktop.util.FormBuilder.addTopLabelTextField; public class PaxumForm extends PaymentMethodForm { private final PaxumAccount account; - private InputTextField emailInputTextField; - private EmailValidator validator = new EmailValidator(); + private final EmailValidator validator = new EmailValidator(); public static int addFormForBuyer(GridPane gridPane, int gridRow, PaymentAccountPayload paymentAccountPayload) { @@ -63,7 +60,7 @@ public PaxumForm(PaymentAccount paymentAccount, AccountAgeWitnessService account public void addFormForAddAccount() { gridRowFrom = gridRow + 1; - emailInputTextField = FormBuilder.addInputTextField(gridPane, ++gridRow, Res.get("payment.email")); + InputTextField emailInputTextField = FormBuilder.addInputTextField(gridPane, ++gridRow, Res.get("payment.email")); emailInputTextField.setValidator(validator); emailInputTextField.textProperty().addListener((ov, oldValue, newValue) -> { account.setEmail(newValue.trim()); @@ -91,14 +88,13 @@ private void addCurrenciesGrid(boolean isEditable) { @Override protected void autoFillNameTextField() { - setAccountNameWithString(emailInputTextField.getText()); + setAccountNameWithString(account.getEmail()); } @Override - public void addFormForDisplayAccount() { + public void addFormForEditAccount() { gridRowFrom = gridRow; - addTopLabelTextField(gridPane, gridRow, Res.get("payment.account.name"), - account.getAccountName(), Layout.FIRST_ROW_AND_GROUP_DISTANCE); + addAccountNameTextFieldWithAutoFillToggleButton(); addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("shared.paymentMethod"), Res.get(account.getPaymentMethod().getId())); TextField field = addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.email"), diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/PaymentMethodForm.java b/desktop/src/main/java/bisq/desktop/components/paymentmethods/PaymentMethodForm.java index 4b9a4dfba74..546e7f986b7 100644 --- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/PaymentMethodForm.java +++ b/desktop/src/main/java/bisq/desktop/components/paymentmethods/PaymentMethodForm.java @@ -28,7 +28,6 @@ import bisq.core.account.witness.AccountAgeWitness; import bisq.core.account.witness.AccountAgeWitnessService; -import bisq.core.locale.Country; import bisq.core.locale.CurrencyUtil; import bisq.core.locale.FiatCurrency; import bisq.core.locale.Res; @@ -68,7 +67,6 @@ import javafx.util.StringConverter; import java.util.Date; -import java.util.List; import java.util.concurrent.TimeUnit; import lombok.extern.slf4j.Slf4j; @@ -318,7 +316,7 @@ void fillUpFlowPaneWithCurrencies(boolean isEditable, FlowPane flowPane, public abstract void addFormForAddAccount(); - public abstract void addFormForDisplayAccount(); + public abstract void addFormForEditAccount(); protected abstract void updateAllInputsValid(); diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/PayseraForm.java b/desktop/src/main/java/bisq/desktop/components/paymentmethods/PayseraForm.java index 9759b2a5b69..3b806097f37 100644 --- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/PayseraForm.java +++ b/desktop/src/main/java/bisq/desktop/components/paymentmethods/PayseraForm.java @@ -19,7 +19,6 @@ import bisq.desktop.components.InputTextField; import bisq.desktop.util.FormBuilder; -import bisq.desktop.util.Layout; import bisq.desktop.util.validation.EmailValidator; import bisq.core.account.witness.AccountAgeWitnessService; @@ -38,12 +37,10 @@ import static bisq.desktop.util.FormBuilder.addCompactTopLabelTextField; import static bisq.desktop.util.FormBuilder.addCompactTopLabelTextFieldWithCopyIcon; -import static bisq.desktop.util.FormBuilder.addTopLabelTextField; public class PayseraForm extends PaymentMethodForm { private final PayseraAccount account; - private InputTextField emailInputTextField; - private EmailValidator validator = new EmailValidator(); + private final EmailValidator validator = new EmailValidator(); public static int addFormForBuyer(GridPane gridPane, int gridRow, PaymentAccountPayload paymentAccountPayload) { @@ -63,7 +60,7 @@ public PayseraForm(PaymentAccount paymentAccount, AccountAgeWitnessService accou public void addFormForAddAccount() { gridRowFrom = gridRow + 1; - emailInputTextField = FormBuilder.addInputTextField(gridPane, ++gridRow, Res.get("payment.email")); + InputTextField emailInputTextField = FormBuilder.addInputTextField(gridPane, ++gridRow, Res.get("payment.email")); emailInputTextField.setValidator(validator); emailInputTextField.textProperty().addListener((ov, oldValue, newValue) -> { account.setEmail(newValue.trim()); @@ -91,14 +88,13 @@ private void addCurrenciesGrid(boolean isEditable) { @Override protected void autoFillNameTextField() { - setAccountNameWithString(emailInputTextField.getText()); + setAccountNameWithString(account.getEmail()); } @Override - public void addFormForDisplayAccount() { + public void addFormForEditAccount() { gridRowFrom = gridRow; - addTopLabelTextField(gridPane, gridRow, Res.get("payment.account.name"), - account.getAccountName(), Layout.FIRST_ROW_AND_GROUP_DISTANCE); + addAccountNameTextFieldWithAutoFillToggleButton(); addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("shared.paymentMethod"), Res.get(account.getPaymentMethod().getId())); TextField field = addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.email"), diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/PaytmForm.java b/desktop/src/main/java/bisq/desktop/components/paymentmethods/PaytmForm.java index 30c08275ecd..772f709bff3 100644 --- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/PaytmForm.java +++ b/desktop/src/main/java/bisq/desktop/components/paymentmethods/PaytmForm.java @@ -41,7 +41,6 @@ public class PaytmForm extends PaymentMethodForm { private final PaytmAccount account; - private InputTextField emailOrMobileNrInputTextField; public static int addFormForBuyer(GridPane gridPane, int gridRow, PaymentAccountPayload paymentAccountPayload) { @@ -65,7 +64,7 @@ public void addFormForAddAccount() { gridRowFrom = gridRow + 1; - emailOrMobileNrInputTextField = FormBuilder.addInputTextField(gridPane, ++gridRow, Res.get("payment.email.mobile")); + InputTextField emailOrMobileNrInputTextField = FormBuilder.addInputTextField(gridPane, ++gridRow, Res.get("payment.email.mobile")); emailOrMobileNrInputTextField.setValidator(inputValidator); emailOrMobileNrInputTextField.textProperty().addListener((ov, oldValue, newValue) -> { account.setEmailOrMobileNr(newValue.trim()); @@ -80,14 +79,13 @@ public void addFormForAddAccount() { @Override protected void autoFillNameTextField() { - setAccountNameWithString(emailOrMobileNrInputTextField.getText()); + setAccountNameWithString(account.getEmailOrMobileNr()); } @Override - public void addFormForDisplayAccount() { + public void addFormForEditAccount() { gridRowFrom = gridRow; - addTopLabelTextField(gridPane, gridRow, Res.get("payment.account.name"), - account.getAccountName(), Layout.FIRST_ROW_AND_GROUP_DISTANCE); + addAccountNameTextFieldWithAutoFillToggleButton(); addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("shared.paymentMethod"), Res.get(account.getPaymentMethod().getId())); TextField field = addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.email.mobile"), diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/PixForm.java b/desktop/src/main/java/bisq/desktop/components/paymentmethods/PixForm.java index a1bdd1581d9..1cd1cc9988b 100644 --- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/PixForm.java +++ b/desktop/src/main/java/bisq/desktop/components/paymentmethods/PixForm.java @@ -41,7 +41,6 @@ public class PixForm extends PaymentMethodForm { private final PixAccount account; - private InputTextField pixKeyInputTextField; public static int addFormForBuyer(GridPane gridPane, int gridRow, PaymentAccountPayload paymentAccountPayload) { @@ -65,7 +64,7 @@ public void addFormForAddAccount() { gridRowFrom = gridRow + 1; - pixKeyInputTextField = FormBuilder.addInputTextField(gridPane, ++gridRow, Res.get("payment.pix.key")); + InputTextField pixKeyInputTextField = FormBuilder.addInputTextField(gridPane, ++gridRow, Res.get("payment.pix.key")); pixKeyInputTextField.setValidator(inputValidator); pixKeyInputTextField.textProperty().addListener((ov, oldValue, newValue) -> { account.setPixKey(newValue.trim()); @@ -80,14 +79,13 @@ public void addFormForAddAccount() { @Override protected void autoFillNameTextField() { - setAccountNameWithString(pixKeyInputTextField.getText()); + setAccountNameWithString(account.getPixKey()); } @Override - public void addFormForDisplayAccount() { + public void addFormForEditAccount() { gridRowFrom = gridRow; - addTopLabelTextField(gridPane, gridRow, Res.get("payment.account.name"), - account.getAccountName(), Layout.FIRST_ROW_AND_GROUP_DISTANCE); + addAccountNameTextFieldWithAutoFillToggleButton(); addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("shared.paymentMethod"), Res.get(account.getPaymentMethod().getId())); TextField field = addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.pix.key"), diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/PopmoneyForm.java b/desktop/src/main/java/bisq/desktop/components/paymentmethods/PopmoneyForm.java index 7265ff3a309..fc5bbedb7d8 100644 --- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/PopmoneyForm.java +++ b/desktop/src/main/java/bisq/desktop/components/paymentmethods/PopmoneyForm.java @@ -19,7 +19,6 @@ import bisq.desktop.components.InputTextField; import bisq.desktop.util.FormBuilder; -import bisq.desktop.util.Layout; import bisq.desktop.util.validation.PopmoneyValidator; import bisq.core.account.witness.AccountAgeWitnessService; @@ -42,7 +41,6 @@ public class PopmoneyForm extends PaymentMethodForm { private final PopmoneyAccount account; private final PopmoneyValidator validator; - private InputTextField accountIdInputTextField; public static int addFormForBuyer(GridPane gridPane, int gridRow, PaymentAccountPayload paymentAccountPayload) { addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.account.owner"), @@ -69,7 +67,7 @@ public void addFormForAddAccount() { updateFromInputs(); }); - accountIdInputTextField = FormBuilder.addInputTextField(gridPane, ++gridRow, Res.get("payment.popmoney.accountId")); + InputTextField accountIdInputTextField = FormBuilder.addInputTextField(gridPane, ++gridRow, Res.get("payment.popmoney.accountId")); accountIdInputTextField.setValidator(validator); accountIdInputTextField.textProperty().addListener((ov, oldValue, newValue) -> { account.setAccountId(newValue.trim()); @@ -85,13 +83,13 @@ public void addFormForAddAccount() { @Override protected void autoFillNameTextField() { - setAccountNameWithString(accountIdInputTextField.getText()); + setAccountNameWithString(account.getAccountId()); } @Override - public void addFormForDisplayAccount() { + public void addFormForEditAccount() { gridRowFrom = gridRow; - addTopLabelTextField(gridPane, gridRow, Res.get("payment.account.name"), account.getAccountName(), Layout.FIRST_ROW_AND_GROUP_DISTANCE); + addAccountNameTextFieldWithAutoFillToggleButton(); addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("shared.paymentMethod"), Res.get(account.getPaymentMethod().getId())); addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.account.owner"), account.getHolderName()); diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/PromptPayForm.java b/desktop/src/main/java/bisq/desktop/components/paymentmethods/PromptPayForm.java index 3f5e02a37c4..0d89438c812 100644 --- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/PromptPayForm.java +++ b/desktop/src/main/java/bisq/desktop/components/paymentmethods/PromptPayForm.java @@ -18,7 +18,6 @@ package bisq.desktop.components.paymentmethods; import bisq.desktop.components.InputTextField; -import bisq.desktop.util.Layout; import bisq.desktop.util.validation.PromptPayValidator; import bisq.core.account.witness.AccountAgeWitnessService; @@ -41,7 +40,6 @@ public class PromptPayForm extends PaymentMethodForm { private final PromptPayAccount promptPayAccount; private final PromptPayValidator promptPayValidator; - private InputTextField promptPayIdInputTextField; public static int addFormForBuyer(GridPane gridPane, int gridRow, PaymentAccountPayload paymentAccountPayload) { @@ -61,7 +59,7 @@ public PromptPayForm(PaymentAccount paymentAccount, AccountAgeWitnessService acc public void addFormForAddAccount() { gridRowFrom = gridRow + 1; - promptPayIdInputTextField = addInputTextField(gridPane, ++gridRow, + InputTextField promptPayIdInputTextField = addInputTextField(gridPane, ++gridRow, Res.get("payment.promptPay.promptPayId")); promptPayIdInputTextField.setValidator(promptPayValidator); promptPayIdInputTextField.textProperty().addListener((ov, oldValue, newValue) -> { @@ -78,14 +76,13 @@ public void addFormForAddAccount() { @Override protected void autoFillNameTextField() { - setAccountNameWithString(promptPayIdInputTextField.getText()); + setAccountNameWithString(promptPayAccount.getPromptPayId()); } @Override - public void addFormForDisplayAccount() { + public void addFormForEditAccount() { gridRowFrom = gridRow; - addTopLabelTextField(gridPane, gridRow, Res.get("payment.account.name"), - promptPayAccount.getAccountName(), Layout.FIRST_ROW_AND_GROUP_DISTANCE); + addAccountNameTextFieldWithAutoFillToggleButton(); addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("shared.paymentMethod"), Res.get(promptPayAccount.getPaymentMethod().getId())); TextField field = addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.promptPay.promptPayId"), diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/RevolutForm.java b/desktop/src/main/java/bisq/desktop/components/paymentmethods/RevolutForm.java index 8ed82f821e0..2441db6507f 100644 --- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/RevolutForm.java +++ b/desktop/src/main/java/bisq/desktop/components/paymentmethods/RevolutForm.java @@ -43,13 +43,11 @@ import static bisq.desktop.util.FormBuilder.addCompactTopLabelTextField; import static bisq.desktop.util.FormBuilder.addCompactTopLabelTextFieldWithCopyIcon; import static bisq.desktop.util.FormBuilder.addTopLabelFlowPane; -import static bisq.desktop.util.FormBuilder.addTopLabelTextField; @Slf4j public class RevolutForm extends PaymentMethodForm { private final RevolutAccount account; - private RevolutValidator validator; - private InputTextField userNameInputTextField; + private final RevolutValidator validator; public static int addFormForBuyer(GridPane gridPane, int gridRow, PaymentAccountPayload paymentAccountPayload) { @@ -70,7 +68,7 @@ public RevolutForm(PaymentAccount paymentAccount, AccountAgeWitnessService accou public void addFormForAddAccount() { gridRowFrom = gridRow + 1; - userNameInputTextField = FormBuilder.addInputTextField(gridPane, ++gridRow, Res.get("payment.account.userName")); + InputTextField userNameInputTextField = FormBuilder.addInputTextField(gridPane, ++gridRow, Res.get("payment.account.userName")); userNameInputTextField.setValidator(validator); userNameInputTextField.textProperty().addListener((ov, oldValue, newValue) -> { account.setUserName(newValue.trim()); @@ -98,14 +96,13 @@ private void addCurrenciesGrid(boolean isEditable) { @Override protected void autoFillNameTextField() { - setAccountNameWithString(userNameInputTextField.getText()); + setAccountNameWithString(account.getUserName()); } @Override - public void addFormForDisplayAccount() { + public void addFormForEditAccount() { gridRowFrom = gridRow; - addTopLabelTextField(gridPane, gridRow, Res.get("payment.account.name"), - account.getAccountName(), Layout.FIRST_ROW_AND_GROUP_DISTANCE); + addAccountNameTextFieldWithAutoFillToggleButton(); addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("shared.paymentMethod"), Res.get(account.getPaymentMethod().getId())); diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/SatispayForm.java b/desktop/src/main/java/bisq/desktop/components/paymentmethods/SatispayForm.java index 2bcd774293e..37641b04faa 100644 --- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/SatispayForm.java +++ b/desktop/src/main/java/bisq/desktop/components/paymentmethods/SatispayForm.java @@ -19,7 +19,6 @@ import bisq.desktop.components.InputTextField; import bisq.desktop.util.FormBuilder; -import bisq.desktop.util.Layout; import bisq.core.account.witness.AccountAgeWitnessService; import bisq.core.locale.CountryUtil; @@ -40,8 +39,6 @@ public class SatispayForm extends PaymentMethodForm { private final SatispayAccount account; - private InputTextField holderNameField; - private InputTextField mobileNrInputTextField; public static int addFormForBuyer(GridPane gridPane, int gridRow, PaymentAccountPayload paymentAccountPayload) { @@ -67,14 +64,14 @@ public void addFormForAddAccount() { gridRowFrom = gridRow + 1; - holderNameField = FormBuilder.addInputTextField(gridPane, ++gridRow, Res.get("payment.account.owner")); + InputTextField holderNameField = FormBuilder.addInputTextField(gridPane, ++gridRow, Res.get("payment.account.owner")); holderNameField.setValidator(inputValidator); holderNameField.textProperty().addListener((ov, oldValue, newValue) -> { account.setHolderName(newValue.trim()); updateFromInputs(); }); - mobileNrInputTextField = FormBuilder.addInputTextField(gridPane, ++gridRow, Res.get("payment.mobile")); + InputTextField mobileNrInputTextField = FormBuilder.addInputTextField(gridPane, ++gridRow, Res.get("payment.mobile")); mobileNrInputTextField.setValidator(inputValidator); mobileNrInputTextField.textProperty().addListener((ov, oldValue, newValue) -> { account.setMobileNr(newValue.trim()); @@ -89,14 +86,13 @@ public void addFormForAddAccount() { @Override protected void autoFillNameTextField() { - setAccountNameWithString(mobileNrInputTextField.getText()); + setAccountNameWithString(account.getMobileNr()); } @Override - public void addFormForDisplayAccount() { + public void addFormForEditAccount() { gridRowFrom = gridRow; - addTopLabelTextField(gridPane, gridRow, Res.get("payment.account.name"), - account.getAccountName(), Layout.FIRST_ROW_AND_GROUP_DISTANCE); + addAccountNameTextFieldWithAutoFillToggleButton(); addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("shared.paymentMethod"), Res.get(account.getPaymentMethod().getId())); addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.account.owner"), account.getHolderName()) diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/SepaForm.java b/desktop/src/main/java/bisq/desktop/components/paymentmethods/SepaForm.java index 66176fba7f4..da6967f8916 100644 --- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/SepaForm.java +++ b/desktop/src/main/java/bisq/desktop/components/paymentmethods/SepaForm.java @@ -19,10 +19,9 @@ import bisq.desktop.components.InputTextField; import bisq.desktop.util.FormBuilder; -import bisq.desktop.util.Layout; +import bisq.desktop.util.normalization.IBANNormalizer; import bisq.desktop.util.validation.BICValidator; import bisq.desktop.util.validation.IBANValidator; -import bisq.desktop.util.normalization.IBANNormalizer; import bisq.core.account.witness.AccountAgeWitnessService; import bisq.core.locale.Country; @@ -44,7 +43,6 @@ import static bisq.desktop.util.FormBuilder.addCompactTopLabelTextField; import static bisq.desktop.util.FormBuilder.addCompactTopLabelTextFieldWithCopyIcon; -import static bisq.desktop.util.FormBuilder.addTopLabelTextField; public class SepaForm extends GeneralSepaForm { @@ -137,7 +135,7 @@ public void updateAllInputsValid() { } @Override - public void addFormForDisplayAccount() { + public void addFormForEditAccount() { gridRowFrom = gridRow; addAccountNameTextFieldWithAutoFillToggleButton(); addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("shared.paymentMethod"), diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/SepaInstantForm.java b/desktop/src/main/java/bisq/desktop/components/paymentmethods/SepaInstantForm.java index 8bbc9ed04df..d251bc0625a 100644 --- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/SepaInstantForm.java +++ b/desktop/src/main/java/bisq/desktop/components/paymentmethods/SepaInstantForm.java @@ -19,10 +19,9 @@ import bisq.desktop.components.InputTextField; import bisq.desktop.util.FormBuilder; -import bisq.desktop.util.Layout; +import bisq.desktop.util.normalization.IBANNormalizer; import bisq.desktop.util.validation.BICValidator; import bisq.desktop.util.validation.IBANValidator; -import bisq.desktop.util.normalization.IBANNormalizer; import bisq.core.account.witness.AccountAgeWitnessService; import bisq.core.locale.Country; @@ -42,10 +41,8 @@ import javafx.collections.FXCollections; - import static bisq.desktop.util.FormBuilder.addCompactTopLabelTextField; import static bisq.desktop.util.FormBuilder.addCompactTopLabelTextFieldWithCopyIcon; -import static bisq.desktop.util.FormBuilder.addTopLabelTextField; public class SepaInstantForm extends GeneralSepaForm { @@ -138,7 +135,7 @@ public void updateAllInputsValid() { } @Override - public void addFormForDisplayAccount() { + public void addFormForEditAccount() { gridRowFrom = gridRow; addAccountNameTextFieldWithAutoFillToggleButton(); addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("shared.paymentMethod"), diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/StrikeForm.java b/desktop/src/main/java/bisq/desktop/components/paymentmethods/StrikeForm.java index 486147e293e..f4067a23503 100644 --- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/StrikeForm.java +++ b/desktop/src/main/java/bisq/desktop/components/paymentmethods/StrikeForm.java @@ -41,7 +41,6 @@ public class StrikeForm extends PaymentMethodForm { private final StrikeAccount account; - private InputTextField holderNameField; public static int addFormForBuyer(GridPane gridPane, int gridRow, PaymentAccountPayload paymentAccountPayload) { @@ -65,7 +64,7 @@ public void addFormForAddAccount() { gridRowFrom = gridRow + 1; - holderNameField = FormBuilder.addInputTextField(gridPane, ++gridRow, Res.get("payment.account.userName")); + InputTextField holderNameField = FormBuilder.addInputTextField(gridPane, ++gridRow, Res.get("payment.account.userName")); holderNameField.setValidator(inputValidator); holderNameField.textProperty().addListener((ov, oldValue, newValue) -> { account.setHolderName(newValue.trim()); @@ -80,14 +79,13 @@ public void addFormForAddAccount() { @Override protected void autoFillNameTextField() { - setAccountNameWithString(holderNameField.getText()); + setAccountNameWithString(account.getHolderName()); } @Override - public void addFormForDisplayAccount() { + public void addFormForEditAccount() { gridRowFrom = gridRow; - addTopLabelTextField(gridPane, gridRow, Res.get("payment.account.name"), - account.getAccountName(), Layout.FIRST_ROW_AND_GROUP_DISTANCE); + addAccountNameTextFieldWithAutoFillToggleButton(); addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("shared.paymentMethod"), Res.get(account.getPaymentMethod().getId())); TextField field = addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.account.userName"), diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/SwiftForm.java b/desktop/src/main/java/bisq/desktop/components/paymentmethods/SwiftForm.java index 0dc088c0a07..1fbbf274a70 100644 --- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/SwiftForm.java +++ b/desktop/src/main/java/bisq/desktop/components/paymentmethods/SwiftForm.java @@ -54,7 +54,6 @@ import static bisq.desktop.util.FormBuilder.addCompactTopLabelTextField; import static bisq.desktop.util.FormBuilder.addInputTextField; import static bisq.desktop.util.FormBuilder.addTopLabelTextArea; -import static bisq.desktop.util.FormBuilder.addTopLabelTextField; public class SwiftForm extends PaymentMethodForm { private final SwiftAccountPayload formData; @@ -88,9 +87,9 @@ protected void autoFillNameTextField() { } @Override - public void addFormForDisplayAccount() { + public void addFormForEditAccount() { gridRowFrom = gridRow; - addTopLabelTextField(gridPane, gridRow, Res.get("payment.account.name"), paymentAccount.getAccountName(), Layout.FIRST_ROW_AND_GROUP_DISTANCE); + addAccountNameTextFieldWithAutoFillToggleButton(); addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("shared.paymentMethod"), Res.get(paymentAccount.getPaymentMethod().getId())); addCompactTopLabelTextField(gridPane, ++gridRow, Res.get(SWIFT_CODE + BANKPOSTFIX), formData.getBankSwiftCode()); diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/SwishForm.java b/desktop/src/main/java/bisq/desktop/components/paymentmethods/SwishForm.java index cb138c84fc2..354f339e478 100644 --- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/SwishForm.java +++ b/desktop/src/main/java/bisq/desktop/components/paymentmethods/SwishForm.java @@ -19,7 +19,6 @@ import bisq.desktop.components.InputTextField; import bisq.desktop.util.FormBuilder; -import bisq.desktop.util.Layout; import bisq.desktop.util.validation.SwishValidator; import bisq.core.account.witness.AccountAgeWitnessService; @@ -45,7 +44,6 @@ public class SwishForm extends PaymentMethodForm { private final SwishAccount swishAccount; private final SwishValidator swishValidator; - private InputTextField mobileNrInputTextField; public SwishForm(PaymentAccount paymentAccount, AccountAgeWitnessService accountAgeWitnessService, @@ -80,7 +78,7 @@ public void addFormForAddAccount() { updateFromInputs(); }); - mobileNrInputTextField = FormBuilder.addInputTextField(gridPane, ++gridRow, + InputTextField mobileNrInputTextField = FormBuilder.addInputTextField(gridPane, ++gridRow, Res.get("payment.mobile")); mobileNrInputTextField.setValidator(swishValidator); mobileNrInputTextField.textProperty().addListener((ov, oldValue, newValue) -> { @@ -97,14 +95,13 @@ public void addFormForAddAccount() { @Override protected void autoFillNameTextField() { - setAccountNameWithString(mobileNrInputTextField.getText()); + setAccountNameWithString(swishAccount.getMobileNr()); } @Override - public void addFormForDisplayAccount() { + public void addFormForEditAccount() { gridRowFrom = gridRow; - addTopLabelTextField(gridPane, gridRow, Res.get("payment.account.name"), - swishAccount.getAccountName(), Layout.FIRST_ROW_AND_GROUP_DISTANCE); + addAccountNameTextFieldWithAutoFillToggleButton(); addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("shared.paymentMethod"), Res.get(swishAccount.getPaymentMethod().getId())); addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.account.owner"), diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/TikkieForm.java b/desktop/src/main/java/bisq/desktop/components/paymentmethods/TikkieForm.java index 5bed80dae7a..0c47afd4ce4 100644 --- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/TikkieForm.java +++ b/desktop/src/main/java/bisq/desktop/components/paymentmethods/TikkieForm.java @@ -19,7 +19,6 @@ import bisq.desktop.components.InputTextField; import bisq.desktop.util.FormBuilder; -import bisq.desktop.util.Layout; import bisq.desktop.util.validation.IBANValidator; import bisq.core.account.witness.AccountAgeWitnessService; @@ -41,7 +40,6 @@ public class TikkieForm extends PaymentMethodForm { private final TikkieAccount account; - private InputTextField ibanField; private final IBANValidator ibanValidator = new IBANValidator("NL"); public static int addFormForBuyer(GridPane gridPane, int gridRow, @@ -66,7 +64,7 @@ public void addFormForAddAccount() { gridRowFrom = gridRow + 1; - ibanField = FormBuilder.addInputTextField(gridPane, ++gridRow, Res.get("payment.tikkie.iban")); + InputTextField ibanField = FormBuilder.addInputTextField(gridPane, ++gridRow, Res.get("payment.tikkie.iban")); ibanField.setValidator(ibanValidator); ibanField.textProperty().addListener((ov, oldValue, newValue) -> { account.setIban(newValue.trim()); @@ -81,14 +79,13 @@ public void addFormForAddAccount() { @Override protected void autoFillNameTextField() { - setAccountNameWithString(ibanField.getText()); + setAccountNameWithString(account.getIban()); } @Override - public void addFormForDisplayAccount() { + public void addFormForEditAccount() { gridRowFrom = gridRow; - addTopLabelTextField(gridPane, gridRow, Res.get("payment.account.name"), - account.getAccountName(), Layout.FIRST_ROW_AND_GROUP_DISTANCE); + addAccountNameTextFieldWithAutoFillToggleButton(); addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("shared.paymentMethod"), Res.get(account.getPaymentMethod().getId())); addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.tikkie.iban"), account.getIban()) diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/TransferwiseForm.java b/desktop/src/main/java/bisq/desktop/components/paymentmethods/TransferwiseForm.java index a9212cd2242..870384ba88a 100644 --- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/TransferwiseForm.java +++ b/desktop/src/main/java/bisq/desktop/components/paymentmethods/TransferwiseForm.java @@ -19,7 +19,6 @@ import bisq.desktop.components.InputTextField; import bisq.desktop.util.FormBuilder; -import bisq.desktop.util.Layout; import bisq.desktop.util.validation.TransferwiseValidator; import bisq.core.account.witness.AccountAgeWitnessService; @@ -38,12 +37,10 @@ import static bisq.desktop.util.FormBuilder.addCompactTopLabelTextField; import static bisq.desktop.util.FormBuilder.addCompactTopLabelTextFieldWithCopyIcon; -import static bisq.desktop.util.FormBuilder.addTopLabelTextField; public class TransferwiseForm extends PaymentMethodForm { private final TransferwiseAccount account; - private TransferwiseValidator validator; - private InputTextField emailInputTextField; + private final TransferwiseValidator validator; public static int addFormForBuyer(GridPane gridPane, int gridRow, PaymentAccountPayload paymentAccountPayload) { @@ -64,7 +61,7 @@ public TransferwiseForm(PaymentAccount paymentAccount, AccountAgeWitnessService public void addFormForAddAccount() { gridRowFrom = gridRow + 1; - emailInputTextField = FormBuilder.addInputTextField(gridPane, ++gridRow, Res.get("payment.email")); + InputTextField emailInputTextField = FormBuilder.addInputTextField(gridPane, ++gridRow, Res.get("payment.email")); emailInputTextField.setValidator(validator); emailInputTextField.textProperty().addListener((ov, oldValue, newValue) -> { account.setEmail(newValue.trim()); @@ -92,14 +89,13 @@ private void addCurrenciesGrid(boolean isEditable) { @Override protected void autoFillNameTextField() { - setAccountNameWithString(emailInputTextField.getText()); + setAccountNameWithString(account.getEmail()); } @Override - public void addFormForDisplayAccount() { + public void addFormForEditAccount() { gridRowFrom = gridRow; - addTopLabelTextField(gridPane, gridRow, Res.get("payment.account.name"), - account.getAccountName(), Layout.FIRST_ROW_AND_GROUP_DISTANCE); + addAccountNameTextFieldWithAutoFillToggleButton(); addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("shared.paymentMethod"), Res.get(account.getPaymentMethod().getId())); TextField field = addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.email"), diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/TransferwiseUsdForm.java b/desktop/src/main/java/bisq/desktop/components/paymentmethods/TransferwiseUsdForm.java index 359afaff8ff..6155a99cbc3 100644 --- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/TransferwiseUsdForm.java +++ b/desktop/src/main/java/bisq/desktop/components/paymentmethods/TransferwiseUsdForm.java @@ -42,7 +42,7 @@ public class TransferwiseUsdForm extends PaymentMethodForm { private final TransferwiseUsdAccount account; private final LengthValidator addressValidator = new LengthValidator(0, 100); - private EmailValidator emailValidator = new EmailValidator(); + private final EmailValidator emailValidator = new EmailValidator(); public static int addFormForBuyer(GridPane gridPane, int gridRow, PaymentAccountPayload paymentAccountPayload) { @@ -114,10 +114,9 @@ protected void autoFillNameTextField() { } @Override - public void addFormForDisplayAccount() { + public void addFormForEditAccount() { gridRowFrom = gridRow; - addTopLabelTextField(gridPane, gridRow, Res.get("payment.account.name"), - account.getAccountName(), Layout.FIRST_ROW_AND_GROUP_DISTANCE); + addAccountNameTextFieldWithAutoFillToggleButton(); addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("shared.paymentMethod"), Res.get(account.getPaymentMethod().getId())); addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.email"), account.getEmail()); diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/USPostalMoneyOrderForm.java b/desktop/src/main/java/bisq/desktop/components/paymentmethods/USPostalMoneyOrderForm.java index dc51aaca3cf..1f17ad8f807 100644 --- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/USPostalMoneyOrderForm.java +++ b/desktop/src/main/java/bisq/desktop/components/paymentmethods/USPostalMoneyOrderForm.java @@ -19,7 +19,6 @@ import bisq.desktop.components.InputTextField; import bisq.desktop.util.FormBuilder; -import bisq.desktop.util.Layout; import bisq.desktop.util.validation.USPostalMoneyOrderValidator; import bisq.core.account.witness.AccountAgeWitnessService; @@ -94,14 +93,13 @@ public void addFormForAddAccount() { @Override protected void autoFillNameTextField() { - setAccountNameWithString(postalAddressTextArea.getText()); + setAccountNameWithString(usPostalMoneyOrderAccount.getPostalAddress()); } @Override - public void addFormForDisplayAccount() { + public void addFormForEditAccount() { gridRowFrom = gridRow; - addTopLabelTextField(gridPane, gridRow, Res.get("payment.account.name"), - usPostalMoneyOrderAccount.getAccountName(), Layout.FIRST_ROW_AND_GROUP_DISTANCE); + addAccountNameTextFieldWithAutoFillToggleButton(); addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("shared.paymentMethod"), Res.get(usPostalMoneyOrderAccount.getPaymentMethod().getId())); addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.account.owner"), diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/UpholdForm.java b/desktop/src/main/java/bisq/desktop/components/paymentmethods/UpholdForm.java index b8290af401a..63e52835d19 100644 --- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/UpholdForm.java +++ b/desktop/src/main/java/bisq/desktop/components/paymentmethods/UpholdForm.java @@ -19,7 +19,6 @@ import bisq.desktop.components.InputTextField; import bisq.desktop.util.FormBuilder; -import bisq.desktop.util.Layout; import bisq.desktop.util.validation.UpholdValidator; import bisq.core.account.witness.AccountAgeWitnessService; @@ -38,12 +37,10 @@ import static bisq.desktop.util.FormBuilder.addCompactTopLabelTextField; import static bisq.desktop.util.FormBuilder.addCompactTopLabelTextFieldWithCopyIcon; -import static bisq.desktop.util.FormBuilder.addTopLabelTextField; public class UpholdForm extends PaymentMethodForm { private final UpholdAccount upholdAccount; - private UpholdValidator upholdValidator; - private InputTextField accountIdInputTextField; + private final UpholdValidator upholdValidator; public static int addFormForBuyer(GridPane gridPane, int gridRow, PaymentAccountPayload paymentAccountPayload) { @@ -80,7 +77,7 @@ public void addFormForAddAccount() { updateFromInputs(); }); - accountIdInputTextField = FormBuilder.addInputTextField(gridPane, ++gridRow, Res.get("payment.uphold.accountId")); + InputTextField accountIdInputTextField = FormBuilder.addInputTextField(gridPane, ++gridRow, Res.get("payment.uphold.accountId")); accountIdInputTextField.setValidator(upholdValidator); accountIdInputTextField.textProperty().addListener((ov, oldValue, newValue) -> { upholdAccount.setAccountId(newValue.trim()); @@ -108,14 +105,13 @@ private void addCurrenciesGrid(boolean isEditable) { @Override protected void autoFillNameTextField() { - setAccountNameWithString(accountIdInputTextField.getText()); + setAccountNameWithString(upholdAccount.getAccountId()); } @Override - public void addFormForDisplayAccount() { + public void addFormForEditAccount() { gridRowFrom = gridRow; - addTopLabelTextField(gridPane, gridRow, Res.get("payment.account.name"), - upholdAccount.getAccountName(), Layout.FIRST_ROW_AND_GROUP_DISTANCE); + addAccountNameTextFieldWithAutoFillToggleButton(); addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("shared.paymentMethod"), Res.get(upholdAccount.getPaymentMethod().getId())); addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.account.owner"), diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/UpiForm.java b/desktop/src/main/java/bisq/desktop/components/paymentmethods/UpiForm.java index 88361c2dfd0..13090e19e25 100644 --- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/UpiForm.java +++ b/desktop/src/main/java/bisq/desktop/components/paymentmethods/UpiForm.java @@ -19,7 +19,6 @@ import bisq.desktop.components.InputTextField; import bisq.desktop.util.FormBuilder; -import bisq.desktop.util.Layout; import bisq.core.account.witness.AccountAgeWitnessService; import bisq.core.locale.CountryUtil; @@ -41,7 +40,6 @@ public class UpiForm extends PaymentMethodForm { private final UpiAccount account; - private InputTextField virtualPaymentAddressInputTextField; public static int addFormForBuyer(GridPane gridPane, int gridRow, PaymentAccountPayload paymentAccountPayload) { @@ -65,7 +63,7 @@ public void addFormForAddAccount() { gridRowFrom = gridRow + 1; - virtualPaymentAddressInputTextField = FormBuilder.addInputTextField(gridPane, ++gridRow, Res.get("payment.upi.virtualPaymentAddress")); + InputTextField virtualPaymentAddressInputTextField = FormBuilder.addInputTextField(gridPane, ++gridRow, Res.get("payment.upi.virtualPaymentAddress")); virtualPaymentAddressInputTextField.setValidator(inputValidator); virtualPaymentAddressInputTextField.textProperty().addListener((ov, oldValue, newValue) -> { account.setVirtualPaymentAddress(newValue.trim()); @@ -80,14 +78,13 @@ public void addFormForAddAccount() { @Override protected void autoFillNameTextField() { - setAccountNameWithString(virtualPaymentAddressInputTextField.getText()); + setAccountNameWithString(account.getVirtualPaymentAddress()); } @Override - public void addFormForDisplayAccount() { + public void addFormForEditAccount() { gridRowFrom = gridRow; - addTopLabelTextField(gridPane, gridRow, Res.get("payment.account.name"), - account.getAccountName(), Layout.FIRST_ROW_AND_GROUP_DISTANCE); + addAccountNameTextFieldWithAutoFillToggleButton(); addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("shared.paymentMethod"), Res.get(account.getPaymentMethod().getId())); TextField field = addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.upi.virtualPaymentAddress"), diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/VerseForm.java b/desktop/src/main/java/bisq/desktop/components/paymentmethods/VerseForm.java index f497d17e76f..180b610c0e4 100644 --- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/VerseForm.java +++ b/desktop/src/main/java/bisq/desktop/components/paymentmethods/VerseForm.java @@ -19,7 +19,6 @@ import bisq.desktop.components.InputTextField; import bisq.desktop.util.FormBuilder; -import bisq.desktop.util.Layout; import bisq.core.account.witness.AccountAgeWitnessService; import bisq.core.locale.CurrencyUtil; @@ -37,11 +36,9 @@ import static bisq.desktop.util.FormBuilder.addCompactTopLabelTextField; import static bisq.desktop.util.FormBuilder.addCompactTopLabelTextFieldWithCopyIcon; -import static bisq.desktop.util.FormBuilder.addTopLabelTextField; public class VerseForm extends PaymentMethodForm { private final VerseAccount account; - private InputTextField holderNameInputTextField; public static int addFormForBuyer(GridPane gridPane, int gridRow, PaymentAccountPayload paymentAccountPayload) { @@ -61,7 +58,7 @@ public VerseForm(PaymentAccount paymentAccount, AccountAgeWitnessService account public void addFormForAddAccount() { gridRowFrom = gridRow + 1; - holderNameInputTextField = FormBuilder.addInputTextField(gridPane, ++gridRow, Res.get("payment.account.userName")); + InputTextField holderNameInputTextField = FormBuilder.addInputTextField(gridPane, ++gridRow, Res.get("payment.account.userName")); holderNameInputTextField.setValidator(inputValidator); holderNameInputTextField.textProperty().addListener((ov, oldValue, newValue) -> { account.setHolderName(newValue.trim()); @@ -89,14 +86,13 @@ private void addCurrenciesGrid(boolean isEditable) { @Override protected void autoFillNameTextField() { - setAccountNameWithString(holderNameInputTextField.getText()); + setAccountNameWithString(account.getHolderName()); } @Override - public void addFormForDisplayAccount() { + public void addFormForEditAccount() { gridRowFrom = gridRow; - addTopLabelTextField(gridPane, gridRow, Res.get("payment.account.name"), - account.getAccountName(), Layout.FIRST_ROW_AND_GROUP_DISTANCE); + addAccountNameTextFieldWithAutoFillToggleButton(); addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("shared.paymentMethod"), Res.get(account.getPaymentMethod().getId())); TextField field = addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.account.userName"), diff --git a/desktop/src/main/java/bisq/desktop/components/paymentmethods/WesternUnionForm.java b/desktop/src/main/java/bisq/desktop/components/paymentmethods/WesternUnionForm.java index b00ebdbe369..21642b1d0f8 100644 --- a/desktop/src/main/java/bisq/desktop/components/paymentmethods/WesternUnionForm.java +++ b/desktop/src/main/java/bisq/desktop/components/paymentmethods/WesternUnionForm.java @@ -20,7 +20,6 @@ import bisq.desktop.components.InputTextField; import bisq.desktop.util.FormBuilder; import bisq.desktop.util.GUIUtil; -import bisq.desktop.util.Layout; import bisq.desktop.util.validation.EmailValidator; import bisq.core.account.witness.AccountAgeWitnessService; @@ -39,8 +38,6 @@ import bisq.common.util.Tuple2; -import org.apache.commons.lang3.StringUtils; - import javafx.scene.control.ComboBox; import javafx.scene.layout.GridPane; @@ -48,7 +45,6 @@ import static bisq.desktop.util.FormBuilder.addCompactTopLabelTextField; import static bisq.desktop.util.FormBuilder.addCompactTopLabelTextFieldWithCopyIcon; -import static bisq.desktop.util.FormBuilder.addTopLabelTextField; @Slf4j public class WesternUnionForm extends PaymentMethodForm { @@ -69,7 +65,6 @@ public static int addFormForBuyer(GridPane gridPane, int gridRow, } private final WesternUnionAccountPayload westernUnionAccountPayload; - private InputTextField holderNameInputTextField; private InputTextField cityInputTextField; private InputTextField stateInputTextField; private final EmailValidator emailValidator; @@ -84,10 +79,10 @@ public WesternUnionForm(PaymentAccount paymentAccount, AccountAgeWitnessService } @Override - public void addFormForDisplayAccount() { + public void addFormForEditAccount() { gridRowFrom = gridRow; - addTopLabelTextField(gridPane, gridRow, Res.get("payment.account.name"), paymentAccount.getAccountName(), Layout.FIRST_ROW_AND_GROUP_DISTANCE); + addAccountNameTextFieldWithAutoFillToggleButton(); addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("shared.paymentMethod"), Res.get(paymentAccount.getPaymentMethod().getId())); addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.country"), @@ -137,7 +132,7 @@ public void addFormForAddAccount() { currencyComboBox = tuple.first; gridRow = tuple.second; - holderNameInputTextField = FormBuilder.addInputTextField(gridPane, + InputTextField holderNameInputTextField = FormBuilder.addInputTextField(gridPane, ++gridRow, Res.get("payment.account.fullName")); holderNameInputTextField.textProperty().addListener((ov, oldValue, newValue) -> { westernUnionAccountPayload.setHolderName(newValue); @@ -185,11 +180,7 @@ private CountryBasedPaymentAccount getCountryBasedPaymentAccount() { @Override protected void autoFillNameTextField() { - if (useCustomAccountNameToggleButton != null && !useCustomAccountNameToggleButton.isSelected()) { - accountNameTextField.setText(Res.get(paymentAccount.getPaymentMethod().getId()) - .concat(": ") - .concat(StringUtils.abbreviate(holderNameInputTextField.getText(), 9))); - } + setAccountNameWithString(westernUnionAccountPayload.getHolderName()); } @Override diff --git a/desktop/src/main/java/bisq/desktop/main/account/content/PaymentAccountsView.java b/desktop/src/main/java/bisq/desktop/main/account/content/PaymentAccountsView.java index 34184860d35..f1cf254c774 100644 --- a/desktop/src/main/java/bisq/desktop/main/account/content/PaymentAccountsView.java +++ b/desktop/src/main/java/bisq/desktop/main/account/content/PaymentAccountsView.java @@ -70,7 +70,7 @@ public void initialize() { buildForm(); paymentAccountChangeListener = (observable, oldValue, newValue) -> { if (newValue != null) - onSelectAccount(newValue); + onSelectAccount(oldValue, newValue); }; Label placeholder = new AutoTooltipLabel(Res.get("shared.noAccountsSetupYet")); placeholder.setWrapText(true); @@ -175,7 +175,8 @@ public void updateItem(final PaymentAccount item, boolean empty) { protected abstract void buildForm(); - protected abstract void onSelectAccount(PaymentAccount paymentAccount); + protected abstract void onSelectAccount(PaymentAccount previous, + PaymentAccount current); protected void copyAccount() { } diff --git a/desktop/src/main/java/bisq/desktop/main/account/content/altcoinaccounts/AltCoinAccountsDataModel.java b/desktop/src/main/java/bisq/desktop/main/account/content/altcoinaccounts/AltCoinAccountsDataModel.java index 183d4f14195..a0f56008cd7 100644 --- a/desktop/src/main/java/bisq/desktop/main/account/content/altcoinaccounts/AltCoinAccountsDataModel.java +++ b/desktop/src/main/java/bisq/desktop/main/account/content/altcoinaccounts/AltCoinAccountsDataModel.java @@ -101,6 +101,12 @@ public void onSaveNewAccount(PaymentAccount paymentAccount) { TradeCurrency singleTradeCurrency = paymentAccount.getSingleTradeCurrency(); preferences.addCryptoCurrency((CryptoCurrency) singleTradeCurrency); user.addPaymentAccount(paymentAccount); + paymentAccount.onPersistChanges(); + } + + public void onUpdateAccount(PaymentAccount paymentAccount) { + paymentAccount.onPersistChanges(); + user.requestPersistence(); } public boolean onDeleteAccount(PaymentAccount paymentAccount) { diff --git a/desktop/src/main/java/bisq/desktop/main/account/content/altcoinaccounts/AltCoinAccountsView.java b/desktop/src/main/java/bisq/desktop/main/account/content/altcoinaccounts/AltCoinAccountsView.java index 258dfb9dfa1..9d107e1d38d 100644 --- a/desktop/src/main/java/bisq/desktop/main/account/content/altcoinaccounts/AltCoinAccountsView.java +++ b/desktop/src/main/java/bisq/desktop/main/account/content/altcoinaccounts/AltCoinAccountsView.java @@ -168,6 +168,16 @@ private void onCancelNewAccount() { preferences.dontShowAgain(INSTANT_TRADE_NEWS, true); } + private void onUpdateAccount(PaymentAccount paymentAccount) { + model.onUpdateAccount(paymentAccount); + removeSelectAccountForm(); + } + + private void onCancelSelectedAccount(PaymentAccount paymentAccount) { + paymentAccount.revertChanges(); + removeSelectAccountForm(); + } + /////////////////////////////////////////////////////////////////////////////////////////// // Base form /////////////////////////////////////////////////////////////////////////////////////////// @@ -213,20 +223,32 @@ protected void addNewAccount() { } // Select account form - protected void onSelectAccount(PaymentAccount paymentAccount) { + protected void onSelectAccount(PaymentAccount previous, PaymentAccount current) { + if (previous != null) { + previous.revertChanges(); + } removeAccountRows(); addAccountButton.setDisable(false); accountTitledGroupBg = addTitledGroupBg(root, ++gridRow, 2, Res.get("shared.selectedAccount"), Layout.GROUP_DISTANCE); - paymentMethodForm = getPaymentMethodForm(paymentAccount); - paymentMethodForm.addFormForDisplayAccount(); + paymentMethodForm = getPaymentMethodForm(current); + paymentMethodForm.addFormForEditAccount(); gridRow = paymentMethodForm.getGridRow(); - Tuple2 tuple = add2ButtonsAfterGroup(root, ++gridRow, Res.get("shared.deleteAccount"), Res.get("shared.cancel")); - Button deleteAccountButton = tuple.first; - deleteAccountButton.setOnAction(event -> onDeleteAccount(paymentAccount)); - Button cancelButton = tuple.second; - cancelButton.setOnAction(event -> removeSelectAccountForm()); + Tuple3 tuple = add3ButtonsAfterGroup( + root, + ++gridRow, + Res.get("shared.save"), + Res.get("shared.deleteAccount"), + Res.get("shared.cancel") + ); + + Button saveAccountButton = tuple.first; + saveAccountButton.setOnAction(event -> onUpdateAccount(current)); + Button deleteAccountButton = tuple.second; + deleteAccountButton.setOnAction(event -> onDeleteAccount(current)); + Button cancelButton = tuple.third; + cancelButton.setOnAction(event -> onCancelSelectedAccount(current)); GridPane.setRowSpan(accountTitledGroupBg, paymentMethodForm.getRowSpan()); - model.onSelectAccount(paymentAccount); + model.onSelectAccount(current); } diff --git a/desktop/src/main/java/bisq/desktop/main/account/content/altcoinaccounts/AltCoinAccountsViewModel.java b/desktop/src/main/java/bisq/desktop/main/account/content/altcoinaccounts/AltCoinAccountsViewModel.java index dbcea1df016..abb94efdd61 100644 --- a/desktop/src/main/java/bisq/desktop/main/account/content/altcoinaccounts/AltCoinAccountsViewModel.java +++ b/desktop/src/main/java/bisq/desktop/main/account/content/altcoinaccounts/AltCoinAccountsViewModel.java @@ -50,6 +50,10 @@ public void onSaveNewAccount(PaymentAccount paymentAccount) { dataModel.onSaveNewAccount(paymentAccount); } + public void onUpdateAccount(PaymentAccount paymentAccount) { + dataModel.onUpdateAccount(paymentAccount); + } + public boolean onDeleteAccount(PaymentAccount paymentAccount) { return dataModel.onDeleteAccount(paymentAccount); } diff --git a/desktop/src/main/java/bisq/desktop/main/account/content/fiataccounts/FiatAccountsView.java b/desktop/src/main/java/bisq/desktop/main/account/content/fiataccounts/FiatAccountsView.java index a0a13e4cb26..5539735fc21 100644 --- a/desktop/src/main/java/bisq/desktop/main/account/content/fiataccounts/FiatAccountsView.java +++ b/desktop/src/main/java/bisq/desktop/main/account/content/fiataccounts/FiatAccountsView.java @@ -476,13 +476,16 @@ public PaymentMethod fromString(String s) { // Select account form @Override - protected void onSelectAccount(PaymentAccount paymentAccount) { + protected void onSelectAccount(PaymentAccount previous, PaymentAccount current) { + if (previous != null) { + previous.revertChanges(); + } removeAccountRows(); addAccountButton.setDisable(false); accountTitledGroupBg = addTitledGroupBg(root, ++gridRow, 2, Res.get("shared.selectedAccount"), Layout.GROUP_DISTANCE); - paymentMethodForm = getPaymentMethodForm(paymentAccount); + paymentMethodForm = getPaymentMethodForm(current); if (paymentMethodForm != null) { - paymentMethodForm.addFormForDisplayAccount(); + paymentMethodForm.addFormForEditAccount(); gridRow = paymentMethodForm.getGridRow(); Tuple3 tuple = add3ButtonsAfterGroup( root, @@ -498,7 +501,7 @@ protected void onSelectAccount(PaymentAccount paymentAccount) { Button cancelButton = tuple.third; cancelButton.setOnAction(event -> onCancelSelectedAccount(paymentMethodForm.getPaymentAccount())); GridPane.setRowSpan(accountTitledGroupBg, paymentMethodForm.getRowSpan()); - model.onSelectAccount(paymentAccount); + model.onSelectAccount(current); } } diff --git a/desktop/src/main/java/bisq/desktop/main/account/content/password/PasswordView.java b/desktop/src/main/java/bisq/desktop/main/account/content/password/PasswordView.java index 3747ce3a0a0..aab39be74b9 100644 --- a/desktop/src/main/java/bisq/desktop/main/account/content/password/PasswordView.java +++ b/desktop/src/main/java/bisq/desktop/main/account/content/password/PasswordView.java @@ -27,7 +27,6 @@ import bisq.desktop.main.MainView; import bisq.desktop.main.account.AccountView; import bisq.desktop.main.account.content.backup.BackupView; -import bisq.desktop.main.account.content.seedwords.SeedWordsView; import bisq.desktop.main.overlays.popups.Popup; import bisq.desktop.util.Layout; import bisq.desktop.util.validation.PasswordValidator; diff --git a/desktop/src/main/java/bisq/desktop/main/offer/bisq_v1/MutableOfferDataModel.java b/desktop/src/main/java/bisq/desktop/main/offer/bisq_v1/MutableOfferDataModel.java index 963e4dc349c..2389ebfb9eb 100644 --- a/desktop/src/main/java/bisq/desktop/main/offer/bisq_v1/MutableOfferDataModel.java +++ b/desktop/src/main/java/bisq/desktop/main/offer/bisq_v1/MutableOfferDataModel.java @@ -53,7 +53,6 @@ import bisq.network.p2p.P2PService; -import bisq.common.app.DevEnv; import bisq.common.util.MathUtils; import bisq.common.util.Tuple2; import bisq.common.util.Utilities; @@ -82,8 +81,6 @@ import java.util.Comparator; import java.util.Date; -import java.util.HashSet; -import java.util.Objects; import java.util.Optional; import java.util.Set; import java.util.function.Predicate; 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 index d85c576909e..70e257d20ee 100644 --- a/desktop/src/main/java/bisq/desktop/main/overlays/windows/DisputeSummaryWindow.java +++ b/desktop/src/main/java/bisq/desktop/main/overlays/windows/DisputeSummaryWindow.java @@ -17,7 +17,6 @@ package bisq.desktop.main.overlays.windows; -import bisq.desktop.components.AutoTooltipCheckBox; import bisq.desktop.components.AutoTooltipRadioButton; import bisq.desktop.components.BisqTextArea; import bisq.desktop.components.InputTextField; @@ -69,7 +68,6 @@ import javafx.scene.Scene; import javafx.scene.control.Button; -import javafx.scene.control.CheckBox; import javafx.scene.control.Label; import javafx.scene.control.RadioButton; import javafx.scene.control.TextArea; diff --git a/desktop/src/test/java/bisq/desktop/util/ImmutableCoinFormatterTest.java b/desktop/src/test/java/bisq/desktop/util/ImmutableCoinFormatterTest.java index afd1744283a..1d91e0ba373 100644 --- a/desktop/src/test/java/bisq/desktop/util/ImmutableCoinFormatterTest.java +++ b/desktop/src/test/java/bisq/desktop/util/ImmutableCoinFormatterTest.java @@ -18,8 +18,8 @@ package bisq.desktop.util; import bisq.core.locale.Res; -import bisq.core.util.coin.ImmutableCoinFormatter; import bisq.core.util.coin.CoinFormatter; +import bisq.core.util.coin.ImmutableCoinFormatter; import bisq.common.config.Config; @@ -36,8 +36,6 @@ import static org.bitcoinj.core.CoinMaker.oneBitcoin; import static org.bitcoinj.core.CoinMaker.satoshis; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.mockito.Mockito.mock; public class ImmutableCoinFormatterTest { diff --git a/p2p/src/main/java/bisq/network/p2p/peers/keepalive/KeepAliveManager.java b/p2p/src/main/java/bisq/network/p2p/peers/keepalive/KeepAliveManager.java index c42b67d0d29..b5021c66823 100644 --- a/p2p/src/main/java/bisq/network/p2p/peers/keepalive/KeepAliveManager.java +++ b/p2p/src/main/java/bisq/network/p2p/peers/keepalive/KeepAliveManager.java @@ -34,7 +34,6 @@ import javax.inject.Inject; -import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.MoreExecutors; import com.google.common.util.concurrent.SettableFuture; @@ -46,8 +45,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.jetbrains.annotations.NotNull; - public class KeepAliveManager implements MessageListener, ConnectionListener, PeerManager.Listener { private static final Logger log = LoggerFactory.getLogger(KeepAliveManager.class);