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

Merge pull request #2426 from ManfredKarrer/remove-email-from-revolut-form

Browse source 
Remove email for Revolut accounts
This commit is contained in:
Christoph Atteneder 2019-02-16 16:50:33 +01:00 • committed by GitHub
commit 7738b914d8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
16 changed files with 40 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
core/src/main/resources/i18n/displayStrings.properties
View file

@ -2348,7 +2348,8 @@ payment.cashApp.cashTag=$Cashtag
payment.moneyBeam.accountId=Email or phone no.
payment.venmo.venmoUserName=Venmo username
payment.popmoney.accountId=Email or phone no.
payment.revolut.accountId=Email or phone no.
payment.revolut.email=Email
payment.revolut.phoneNr=Registered phone no.
payment.promptPay.promptPayId=Citizen ID/Tax ID or phone no.
payment.supportedCurrencies=Supported currencies
payment.limitations=Limitations
@ -2441,6 +2442,9 @@ payment.limits.info=Please be aware that all bank transfers carry a certain amou
payment.cashDeposit.info=Please confirm your bank allows you to send cash deposits into other peoples' accounts. \
For example, Bank of America and Wells Fargo no longer allow such deposits.
payment.revolut.info=Please be sure that the phone number you used for your Revolut account is registered at Revolut \
otherwise the BTC buyer cannot send you the funds.
payment.f2f.contact=Contact info
payment.f2f.contact.prompt=How you want to get contacted by the trading peer? (email address, phone number,...)
payment.f2f.city=City for 'Face to face' meeting

2
core/src/main/resources/i18n/displayStrings_de.properties
View file

@ -2035,7 +2035,7 @@ payment.cashApp.cashTag=$Cashtag
payment.moneyBeam.accountId=E-Mail oder Telefonnummer
payment.venmo.venmoUserName=Venmo Nutzername
payment.popmoney.accountId=E-Mail oder Telefonnummer
payment.revolut.accountId=E-Mail oder Telefonnummer
payment.revolut.email=E-Mail oder Telefonnummer
payment.promptPay.promptPayId=Personalausweis/Steuernummer oder Telefonnr.
payment.supportedCurrencies=Unterstützte Währungen
payment.limitations=Einschränkungen

2
core/src/main/resources/i18n/displayStrings_el.properties
View file

@ -2035,7 +2035,7 @@ payment.cashApp.cashTag=$Cashtag
payment.moneyBeam.accountId=Email or phone no.
payment.venmo.venmoUserName=Venmo username
payment.popmoney.accountId=Email or phone no.
payment.revolut.accountId=Email or phone no.
payment.revolut.email=Email or phone no.
payment.promptPay.promptPayId=Citizen ID/Tax ID or phone no.
payment.supportedCurrencies=Supported currencies
payment.limitations=Limitations

2
core/src/main/resources/i18n/displayStrings_es.properties
View file

@ -2035,7 +2035,7 @@ payment.cashApp.cashTag=$Cashtag
payment.moneyBeam.accountId=Correo electrónico o núm. de telefóno
payment.venmo.venmoUserName=Nombre de usuario Venmo
payment.popmoney.accountId=Correo electrónico o núm. de telefóno
payment.revolut.accountId=Correo electrónico o núm. de telefóno
payment.revolut.email=Correo electrónico o núm. de telefóno
payment.promptPay.promptPayId=Citizen ID/Tax ID o número de teléfono
payment.supportedCurrencies=Monedas soportadas
payment.limitations=Límitaciones:

2
core/src/main/resources/i18n/displayStrings_fa.properties
View file

@ -2035,7 +2035,7 @@ payment.cashApp.cashTag=$Cashtag
payment.moneyBeam.accountId=ایمیل یا شماره تلفن
payment.venmo.venmoUserName=نام کاربری Venmo
payment.popmoney.accountId=ایمیل یا شماره تلفن
payment.revolut.accountId=ایمیل یا شماره تلفن
payment.revolut.email=ایمیل یا شماره تلفن
payment.promptPay.promptPayId=شناسه شهروندی/شناسه مالیاتی یا شماره تلفن
payment.supportedCurrencies=ارزهای مورد حمایت
payment.limitations=محدودیت‌ها

2
core/src/main/resources/i18n/displayStrings_fr.properties
View file

@ -2035,7 +2035,7 @@ payment.cashApp.cashTag=$Cashtag
payment.moneyBeam.accountId=Email or phone no.
payment.venmo.venmoUserName=Venmo username
payment.popmoney.accountId=Email or phone no.
payment.revolut.accountId=Email or phone no.
payment.revolut.email=Email or phone no.
payment.promptPay.promptPayId=Citizen ID/Tax ID or phone no.
payment.supportedCurrencies=Supported currencies
payment.limitations=Limitations

2
core/src/main/resources/i18n/displayStrings_hu.properties
View file

@ -2035,7 +2035,7 @@ payment.cashApp.cashTag=$Cashtag
payment.moneyBeam.accountId=Email or phone no.
payment.venmo.venmoUserName=Venmo username
payment.popmoney.accountId=Email or phone no.
payment.revolut.accountId=Email or phone no.
payment.revolut.email=Email or phone no.
payment.promptPay.promptPayId=Citizen ID/Tax ID or phone no.
payment.supportedCurrencies=Supported currencies
payment.limitations=Limitations

2
core/src/main/resources/i18n/displayStrings_pt.properties
View file

@ -2035,7 +2035,7 @@ payment.cashApp.cashTag=$Cashtag:
payment.moneyBeam.accountId=E-mail ou nº de telefone
payment.venmo.venmoUserName=Nome do usuário do Venmo
payment.popmoney.accountId=E-mail ou nº de telefone
payment.revolut.accountId=E-mail ou nº de telefone
payment.revolut.email=E-mail ou nº de telefone
payment.promptPay.promptPayId=Citizen ID/Tax ID or phone no.
payment.supportedCurrencies=Moedas suportadas
payment.limitations=Limites

2
core/src/main/resources/i18n/displayStrings_ro.properties
View file

@ -2035,7 +2035,7 @@ payment.cashApp.cashTag=$Cashtag
payment.moneyBeam.accountId=Email or phone no.
payment.venmo.venmoUserName=Venmo username
payment.popmoney.accountId=Email or phone no.
payment.revolut.accountId=Email or phone no.
payment.revolut.email=Email or phone no.
payment.promptPay.promptPayId=Citizen ID/Tax ID or phone no.
payment.supportedCurrencies=Supported currencies
payment.limitations=Limitations

2
core/src/main/resources/i18n/displayStrings_ru.properties
View file

@ -2035,7 +2035,7 @@ payment.cashApp.cashTag=$Cashtag
payment.moneyBeam.accountId=Э-почта или тел. номер
payment.venmo.venmoUserName=Логин Venmo
payment.popmoney.accountId=Э-почта или тел. номер
payment.revolut.accountId=Э-почта или тел. номер
payment.revolut.email=Э-почта или тел. номер
payment.promptPay.promptPayId=Удостовер. гражданства / налог. идент. или номер телефона.
payment.supportedCurrencies=Поддерживаемые валюты
payment.limitations=Ограничения

2
core/src/main/resources/i18n/displayStrings_sr.properties
View file

@ -2035,7 +2035,7 @@ payment.cashApp.cashTag=$Cashtag
payment.moneyBeam.accountId=Email or phone no.
payment.venmo.venmoUserName=Venmo username
payment.popmoney.accountId=Email or phone no.
payment.revolut.accountId=Email or phone no.
payment.revolut.email=Email or phone no.
payment.promptPay.promptPayId=Citizen ID/Tax ID or phone no.
payment.supportedCurrencies=Supported currencies
payment.limitations=Limitations

2
core/src/main/resources/i18n/displayStrings_th.properties
View file

@ -2035,7 +2035,7 @@ payment.cashApp.cashTag=$Cashtag
payment.moneyBeam.accountId=อีเมลหรือหมายเลขโทรศัพท์
payment.venmo.venmoUserName=ชื่อผู้ใช้ Venmo
payment.popmoney.accountId=อีเมลหรือหมายเลขโทรศัพท์
payment.revolut.accountId=อีเมลหรือหมายเลขโทรศัพท์
payment.revolut.email=อีเมลหรือหมายเลขโทรศัพท์
payment.promptPay.promptPayId=รหัสบัตรประชาชน/รหัสประจำตัวผู้เสียภาษี หรือเบอร์โทรศัพท์
payment.supportedCurrencies=สกุลเงินที่ได้รับการสนับสนุน
payment.limitations=ข้อจำกัด

2
core/src/main/resources/i18n/displayStrings_vi.properties
View file

@ -2035,7 +2035,7 @@ payment.cashApp.cashTag=$Cashtag
payment.moneyBeam.accountId=Email hoặc số điện thoại
payment.venmo.venmoUserName=Tên người dùng Venmo
payment.popmoney.accountId=Email hoặc số điện thoại
payment.revolut.accountId=Email hoặc số điện thoại
payment.revolut.email=Email hoặc số điện thoại
payment.promptPay.promptPayId=ID công dân/ ID thuế hoặc số điện thoại
payment.supportedCurrencies=Tiền tệ hỗ trợ
payment.limitations=Hạn chế

2
core/src/main/resources/i18n/displayStrings_zh.properties
View file

@ -2035,7 +2035,7 @@ payment.cashApp.cashTag=$Cashtag
payment.moneyBeam.accountId=Email or phone no.
payment.venmo.venmoUserName=Venmo username
payment.popmoney.accountId=Email or phone no.
payment.revolut.accountId=Email or phone no.
payment.revolut.email=Email or phone no.
payment.promptPay.promptPayId=Citizen ID/Tax ID or phone no.
payment.supportedCurrencies=Supported currencies
payment.limitations=Limitations

19
desktop/src/main/java/bisq/desktop/components/paymentmethods/RevolutForm.java
View file

@ -48,11 +48,20 @@ public class RevolutForm extends PaymentMethodForm {
public static int addFormForBuyer(GridPane gridPane, int gridRow,
PaymentAccountPayload paymentAccountPayload) {
addCompactTopLabelTextFieldWithCopyIcon(gridPane, ++gridRow, Res.get("payment.revolut.accountId"),
((RevolutAccountPayload) paymentAccountPayload).getAccountId());
String accountId = ((RevolutAccountPayload) paymentAccountPayload).getAccountId();
addCompactTopLabelTextFieldWithCopyIcon(gridPane, ++gridRow, getTitle(accountId), accountId);
return gridRow;
}
private static String getTitle(String accountId) {
// From 0.9.4 on we only allow phone nr. as with emails we got too many disputes as users used an email which was
// not registered at Revolut. It seems that phone numbers need to be registered at least we have no reports from
// arbitrators with such cases. Thought email is still supported for backward compatibility.
// We might still get emails from users who have registered when email was supported
return accountId.contains("@") ? Res.get("payment.revolut.email") : Res.get("payment.revolut.phoneNr");
}
public RevolutForm(PaymentAccount paymentAccount, AccountAgeWitnessService accountAgeWitnessService,
RevolutValidator revolutValidator, InputValidator inputValidator, GridPane gridPane,
int gridRow, BSFormatter formatter) {
@ -65,7 +74,7 @@ public class RevolutForm extends PaymentMethodForm {
public void addFormForAddAccount() {
gridRowFrom = gridRow + 1;
accountIdInputTextField = FormBuilder.addInputTextField(gridPane, ++gridRow, Res.get("payment.revolut.accountId"));
accountIdInputTextField = FormBuilder.addInputTextField(gridPane, ++gridRow, Res.get("payment.revolut.phoneNr"));
accountIdInputTextField.setValidator(validator);
accountIdInputTextField.textProperty().addListener((ov, oldValue, newValue) -> {
account.setAccountId(newValue);
@ -102,8 +111,8 @@ public class RevolutForm extends PaymentMethodForm {
account.getAccountName(), Layout.FIRST_ROW_AND_GROUP_DISTANCE);
addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("shared.paymentMethod"),
Res.get(account.getPaymentMethod().getId()));
TextField field = addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.revolut.accountId"),
account.getAccountId()).second;
String accountId = account.getAccountId();
TextField field = addCompactTopLabelTextField(gridPane, ++gridRow, getTitle(accountId), accountId).second;
field.setMouseTransparent(false);
addLimitations(true);
addCurrenciesGrid(false);

8
desktop/src/main/java/bisq/desktop/main/account/content/fiataccounts/FiatAccountsView.java
View file

@ -79,6 +79,7 @@ import bisq.core.payment.HalCashAccount;
import bisq.core.payment.MoneyGramAccount;
import bisq.core.payment.PaymentAccount;
import bisq.core.payment.PaymentAccountFactory;
import bisq.core.payment.RevolutAccount;
import bisq.core.payment.WesternUnionAccount;
import bisq.core.payment.payload.PaymentMethod;
import bisq.core.util.BSFormatter;
@ -268,6 +269,13 @@ public class FiatAccountsView extends PaymentAccountsView<GridPane, FiatAccounts
.actionButtonText(Res.get("shared.iConfirm"))
.onAction(() -> doSaveNewAccount(paymentAccount))
.show();
} else if (paymentAccount instanceof RevolutAccount) {
new Popup<>().information(Res.get("payment.revolut.info"))
.width(700)
.closeButtonText(Res.get("shared.cancel"))
.actionButtonText(Res.get("shared.iConfirm"))
.onAction(() -> doSaveNewAccount(paymentAccount))
.show();
} else {
doSaveNewAccount(paymentAccount);
}