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

Merge pull request #1989 from ripcurlx/fixes-during-testing

Browse source 
Redesign: Bug fixes during testing
This commit is contained in:
Manfred Karrer 2018-11-28 18:17:34 +01:00 • committed by GitHub
commit d025d993eb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
36 changed files with 179 additions and 118 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/src/main/java/bisq/core/payment/payload/AdvancedCashAccountPayload.java
View file

@ -17,6 +17,8 @@
package bisq.core.payment.payload;
import bisq.core.locale.Res;
import io.bisq.generated.protobuffer.PB;
import com.google.protobuf.Message;
@ -89,7 +91,7 @@ public final class AdvancedCashAccountPayload extends PaymentAccountPayload {
@Override
public String getPaymentDetails() {
return "Advanced Cash - Wallet ID: " + accountNr;
return Res.get(paymentMethodId) + " - " + Res.getWithCol("payment.wallet") + " " + accountNr;
}
@Override

4
core/src/main/java/bisq/core/payment/payload/AliPayAccountPayload.java
View file

@ -17,6 +17,8 @@
package bisq.core.payment.payload;
import bisq.core.locale.Res;
import io.bisq.generated.protobuffer.PB;
import com.google.protobuf.Message;
@ -86,7 +88,7 @@ public final class AliPayAccountPayload extends PaymentAccountPayload {
@Override
public String getPaymentDetails() {
return "AliPay - Account no.: " + accountNr;
return Res.get(paymentMethodId) + " - " + Res.getWithCol("payment.account.no") + " " + accountNr;
}
@Override

19
core/src/main/java/bisq/core/payment/payload/BankAccountPayload.java
View file

@ -19,6 +19,7 @@ package bisq.core.payment.payload;
import bisq.core.locale.BankUtil;
import bisq.core.locale.CountryUtil;
import bisq.core.locale.Res;
import io.bisq.generated.protobuffer.PB;
@ -123,21 +124,21 @@ public abstract class BankAccountPayload extends CountryBasedPaymentAccountPaylo
@Override
public String getPaymentDetailsForTradePopup() {
String bankName = BankUtil.isBankNameRequired(countryCode) ?
BankUtil.getBankNameLabel(countryCode) + " " + this.bankName + "\n" : "";
BankUtil.getBankNameLabel(countryCode) + ": " + this.bankName + "\n" : "";
String bankId = BankUtil.isBankIdRequired(countryCode) ?
BankUtil.getBankIdLabel(countryCode) + " " + this.bankId + "\n" : "";
BankUtil.getBankIdLabel(countryCode) + ": " + this.bankId + "\n" : "";
String branchId = BankUtil.isBranchIdRequired(countryCode) ?
BankUtil.getBranchIdLabel(countryCode) + " " + this.branchId + "\n" : "";
BankUtil.getBranchIdLabel(countryCode) + ": " + this.branchId + "\n" : "";
String nationalAccountId = BankUtil.isNationalAccountIdRequired(countryCode) ?
BankUtil.getNationalAccountIdLabel(countryCode) + " " + this.nationalAccountId + "\n" : "";
BankUtil.getNationalAccountIdLabel(countryCode) + ": " + this.nationalAccountId + "\n" : "";
String accountNr = BankUtil.isAccountNrRequired(countryCode) ?
BankUtil.getAccountNrLabel(countryCode) + " " + this.accountNr + "\n" : "";
BankUtil.getAccountNrLabel(countryCode) + ": " + this.accountNr + "\n" : "";
String accountType = BankUtil.isAccountTypeRequired(countryCode) ?
BankUtil.getAccountTypeLabel(countryCode) + " " + this.accountType + "\n" : "";
BankUtil.getAccountTypeLabel(countryCode) + ": " + this.accountType + "\n" : "";
String holderTaxIdString = BankUtil.isHolderIdRequired(countryCode) ?
(BankUtil.getHolderIdLabel(countryCode) + " " + holderTaxId + "\n") : "";
(BankUtil.getHolderIdLabel(countryCode) + ": " + holderTaxId + "\n") : "";
return "Holder name: " + holderName + "\n" +
return Res.getWithCol("payment.account.owner") + " " + holderName + "\n" +
bankName +
bankId +
branchId +
@ -145,7 +146,7 @@ public abstract class BankAccountPayload extends CountryBasedPaymentAccountPaylo
accountNr +
accountType +
holderTaxIdString +
"Country of bank: " + CountryUtil.getNameByCode(countryCode);
Res.getWithCol("payment.bank.country") + " " + CountryUtil.getNameByCode(countryCode);
}
protected String getHolderIdLabel() {

4
core/src/main/java/bisq/core/payment/payload/CashAppAccountPayload.java
View file

@ -17,6 +17,8 @@
package bisq.core.payment.payload;
import bisq.core.locale.Res;
import io.bisq.generated.protobuffer.PB;
import com.google.protobuf.Message;
@ -89,7 +91,7 @@ public final class CashAppAccountPayload extends PaymentAccountPayload {
@Override
public String getPaymentDetails() {
return "CashApp - Account: " + cashTag;
return Res.get(paymentMethodId) + " - " + Res.getWithCol("payment.account") + " " + cashTag;
}
@Override

22
core/src/main/java/bisq/core/payment/payload/CashDepositAccountPayload.java
View file

@ -164,25 +164,25 @@ public class CashDepositAccountPayload extends CountryBasedPaymentAccountPayload
@Override
public String getPaymentDetailsForTradePopup() {
String bankName = BankUtil.isBankNameRequired(countryCode) ?
BankUtil.getBankNameLabel(countryCode) + " " + this.bankName + "\n" : "";
BankUtil.getBankNameLabel(countryCode) + ": " + this.bankName + "\n" : "";
String bankId = BankUtil.isBankIdRequired(countryCode) ?
BankUtil.getBankIdLabel(countryCode) + " " + this.bankId + "\n" : "";
BankUtil.getBankIdLabel(countryCode) + ": " + this.bankId + "\n" : "";
String branchId = BankUtil.isBranchIdRequired(countryCode) ?
BankUtil.getBranchIdLabel(countryCode) + " " + this.branchId + "\n" : "";
BankUtil.getBranchIdLabel(countryCode) + ": " + this.branchId + "\n" : "";
String nationalAccountId = BankUtil.isNationalAccountIdRequired(countryCode) ?
BankUtil.getNationalAccountIdLabel(countryCode) + " " + this.nationalAccountId + "\n" : "";
BankUtil.getNationalAccountIdLabel(countryCode) + ": " + this.nationalAccountId + "\n" : "";
String accountNr = BankUtil.isAccountNrRequired(countryCode) ?
BankUtil.getAccountNrLabel(countryCode) + " " + this.accountNr + "\n" : "";
BankUtil.getAccountNrLabel(countryCode) + ": " + this.accountNr + "\n" : "";
String accountType = BankUtil.isAccountTypeRequired(countryCode) ?
BankUtil.getAccountTypeLabel(countryCode) + " " + this.accountType + "\n" : "";
BankUtil.getAccountTypeLabel(countryCode) + ": " + this.accountType + "\n" : "";
String holderTaxIdString = BankUtil.isHolderIdRequired(countryCode) ?
(BankUtil.getHolderIdLabel(countryCode) + " " + holderTaxId + "\n") : "";
(BankUtil.getHolderIdLabel(countryCode) + ": " + holderTaxId + "\n") : "";
String requirementsString = requirements != null && !requirements.isEmpty() ?
("Extra requirements: " + requirements + "\n") : "";
(Res.getWithCol("payment.extras") + " " + requirements + "\n") : "";
String emailString = holderEmail != null ?
(Res.get("payment.email") + " " + holderEmail + "\n") : "";
(Res.getWithCol("payment.email") + " " + holderEmail + "\n") : "";
return "Holder name: " + holderName + "\n" +
return Res.getWithCol("payment.account.owner") + " " + holderName + "\n" +
emailString +
bankName +
bankId +
@ -192,7 +192,7 @@ public class CashDepositAccountPayload extends CountryBasedPaymentAccountPayload
accountType +
holderTaxIdString +
requirementsString +
"Country of bank: " + CountryUtil.getNameByCode(countryCode);
Res.getWithCol("payment.bank.country") + " " + CountryUtil.getNameByCode(countryCode);
}
public String getHolderIdLabel() {

8
core/src/main/java/bisq/core/payment/payload/ChaseQuickPayAccountPayload.java
View file

@ -17,6 +17,8 @@
package bisq.core.payment.payload;
import bisq.core.locale.Res;
import io.bisq.generated.protobuffer.PB;
import com.google.protobuf.Message;
@ -94,13 +96,13 @@ public final class ChaseQuickPayAccountPayload extends PaymentAccountPayload {
@Override
public String getPaymentDetails() {
return "Chase QuickPay - Holder name: " + holderName + ", email: " + email;
return Res.get(paymentMethodId) + " - " + Res.getWithCol("payment.account.owner") + " " + holderName + ", " + Res.get("payment.email") + " " + email;
}
@Override
public String getPaymentDetailsForTradePopup() {
return "Holder name: " + holderName + "\n" +
"Email: " + email;
return Res.getWithCol("payment.account.owner") + " " + holderName + "\n" +
Res.getWithCol("payment.email") + " " + email;
}
@Override

8
core/src/main/java/bisq/core/payment/payload/ClearXchangeAccountPayload.java
View file

@ -17,6 +17,8 @@
package bisq.core.payment.payload;
import bisq.core.locale.Res;
import io.bisq.generated.protobuffer.PB;
import com.google.protobuf.Message;
@ -94,13 +96,13 @@ public final class ClearXchangeAccountPayload extends PaymentAccountPayload {
@Override
public String getPaymentDetails() {
return "Zelle (ClearXchange) - Holder name: " + holderName + ", Email or mobile no.: " + emailOrMobileNr;
return Res.get(paymentMethodId) + " - " + Res.getWithCol("payment.account.owner") + " " + holderName + ", " + Res.getWithCol("payment.emailOrMobile") + " " + emailOrMobileNr;
}
@Override
public String getPaymentDetailsForTradePopup() {
return "Holder name: " + holderName + "\n" +
"Email or mobile no.: " + emailOrMobileNr;
return Res.getWithCol("payment.account.owner") + " " + holderName + "\n" +
Res.getWithCol("payment.emailOrMobile") + " " + emailOrMobileNr;
}
@Override

4
core/src/main/java/bisq/core/payment/payload/CryptoCurrencyAccountPayload.java
View file

@ -17,6 +17,8 @@
package bisq.core.payment.payload;
import bisq.core.locale.Res;
import io.bisq.generated.protobuffer.PB;
import com.google.protobuf.Message;
@ -88,7 +90,7 @@ public final class CryptoCurrencyAccountPayload extends PaymentAccountPayload {
@Override
public String getPaymentDetails() {
return "Receivers altcoin address: " + address;
return Res.getWithCol("payment.altcoin.receiver.address") + " " + address;
}
@Override

8
core/src/main/java/bisq/core/payment/payload/F2FAccountPayload.java
View file

@ -17,6 +17,8 @@
package bisq.core.payment.payload;
import bisq.core.locale.Res;
import io.bisq.generated.protobuffer.PB;
import com.google.protobuf.Message;
@ -109,7 +111,9 @@ public final class F2FAccountPayload extends CountryBasedPaymentAccountPayload {
@Override
public String getPaymentDetails() {
return "Face to Face - Contact: " + contact + ", city: " + city + ", additional information: " + extraInfo;
return Res.get(paymentMethodId) + " - " + Res.getWithCol("payment.f2f.contact") + " " + contact + ", " +
Res.getWithCol("payment.f2f.city") + " " + city +
", " + Res.getWithCol("payment.f2f.extra") + " " + extraInfo;
}
@ -117,7 +121,7 @@ public final class F2FAccountPayload extends CountryBasedPaymentAccountPayload {
public String getPaymentDetailsForTradePopup() {
// We don't show here more as the makers extra data are the relevant for the trade. City has to be anyway the
// same for maker and taker.
return "Contact details: " + contact;
return Res.getWithCol("payment.f2f.contact") + " " + contact;
}
@Override

6
core/src/main/java/bisq/core/payment/payload/FasterPaymentsAccountPayload.java
View file

@ -17,6 +17,8 @@
package bisq.core.payment.payload;
import bisq.core.locale.Res;
import io.bisq.generated.protobuffer.PB;
import com.google.protobuf.Message;
@ -101,13 +103,13 @@ public final class FasterPaymentsAccountPayload extends PaymentAccountPayload {
@Override
public String getPaymentDetails() {
return "FasterPayments - UK Sort code: " + sortCode + ", Account number: " + accountNr;
return Res.get(paymentMethodId) + " - UK Sort code: " + sortCode + ", " + Res.getWithCol("payment.accountNr") + " " + accountNr;
}
@Override
public String getPaymentDetailsForTradePopup() {
return "UK Sort code: " + sortCode + "\n" +
"Account number: " + accountNr;
Res.getWithCol("payment.accountNr") + " " + accountNr;
}
@Override

6
core/src/main/java/bisq/core/payment/payload/HalCashAccountPayload.java
View file

@ -17,6 +17,8 @@
package bisq.core.payment.payload;
import bisq.core.locale.Res;
import io.bisq.generated.protobuffer.PB;
import com.google.protobuf.Message;
@ -87,12 +89,12 @@ public final class HalCashAccountPayload extends PaymentAccountPayload {
@Override
public String getPaymentDetails() {
return "HalCash - Mobile no.: " + mobileNr;
return Res.get(paymentMethodId) + " - " + Res.getWithCol("payment.mobile") + " " + mobileNr;
}
@Override
public String getPaymentDetailsForTradePopup() {
return "Mobile no.: " + mobileNr;
return Res.getWithCol("payment.mobile") + " " + mobileNr;
}
@Override

14
core/src/main/java/bisq/core/payment/payload/InteracETransferAccountPayload.java
View file

@ -17,6 +17,8 @@
package bisq.core.payment.payload;
import bisq.core.locale.Res;
import io.bisq.generated.protobuffer.PB;
import com.google.protobuf.Message;
@ -105,15 +107,17 @@ public final class InteracETransferAccountPayload extends PaymentAccountPayload
@Override
public String getPaymentDetails() {
return "Interac e-Transfer - Holder name: " + holderName + ", email: " + email + ", secret question: " + question + ", answer: " + answer;
return Res.get(paymentMethodId) + " - " + Res.getWithCol("payment.account.owner") + " " + holderName + ", " +
Res.get("payment.email") + " " + email + ", " + Res.getWithCol("payment.secret") + " " +
question + ", " + Res.getWithCol("payment.answer") + " " + answer;
}
@Override
public String getPaymentDetailsForTradePopup() {
return "Holder name: " + holderName + "\n" +
"Email: " + email + "\n" +
"Secret question: " + question + "\n" +
"Answer: " + answer;
return Res.getWithCol("payment.account.owner") + " " + holderName + "\n" +
Res.getWithCol("payment.email") + " " + email + "\n" +
Res.getWithCol("payment.secret") + " " + question + "\n" +
Res.getWithCol("payment.answer") + " " + answer;
}
@Override

4
core/src/main/java/bisq/core/payment/payload/MoneyBeamAccountPayload.java
View file

@ -17,6 +17,8 @@
package bisq.core.payment.payload;
import bisq.core.locale.Res;
import io.bisq.generated.protobuffer.PB;
import com.google.protobuf.Message;
@ -87,7 +89,7 @@ public final class MoneyBeamAccountPayload extends PaymentAccountPayload {
@Override
public String getPaymentDetails() {
return "MoneyBeam - Account: " + accountId;
return Res.get(paymentMethodId) + " - " + Res.getWithCol("payment.account") + " " + accountId;
}
@Override

12
core/src/main/java/bisq/core/payment/payload/MoneyGramAccountPayload.java
View file

@ -19,6 +19,7 @@ package bisq.core.payment.payload;
import bisq.core.locale.BankUtil;
import bisq.core.locale.CountryUtil;
import bisq.core.locale.Res;
import io.bisq.generated.protobuffer.PB;
@ -110,16 +111,17 @@ public class MoneyGramAccountPayload extends PaymentAccountPayload {
@Override
public String getPaymentDetails() {
return "MoneyGram - " + getPaymentDetailsForTradePopup().replace("\n", ", ");
return Res.get(paymentMethodId) + " - " + getPaymentDetailsForTradePopup().replace("\n", ", ");
}
@Override
public String getPaymentDetailsForTradePopup() {
String state = BankUtil.isStateRequired(countryCode) ? ("State: " + this.state + "\n") : "";
return "Full name: " + holderName + "\n" +
String state = BankUtil.isStateRequired(countryCode) ? (Res.getWithCol("payment.account.state") +
" " + this.state + "\n") : "";
return Res.getWithCol("payment.account.fullName") + " " + holderName + "\n" +
state +
"Country: " + CountryUtil.getNameByCode(countryCode) + "\n" +
"Email: " + email;
Res.getWithCol("payment.account.country") + " " + CountryUtil.getNameByCode(countryCode) + "\n" +
Res.getWithCol("payment.email") + " " + email;
}
@Override

4
core/src/main/java/bisq/core/payment/payload/NationalBankAccountPayload.java
View file

@ -17,6 +17,8 @@
package bisq.core.payment.payload;
import bisq.core.locale.Res;
import io.bisq.generated.protobuffer.PB;
import com.google.protobuf.Message;
@ -110,6 +112,6 @@ public final class NationalBankAccountPayload extends BankAccountPayload {
@Override
public String getPaymentDetails() {
return "National Bank transfer - " + getPaymentDetailsForTradePopup().replace("\n", ", ");
return Res.get(paymentMethodId) + " - " + getPaymentDetailsForTradePopup().replace("\n", ", ");
}
}

4
core/src/main/java/bisq/core/payment/payload/OKPayAccountPayload.java
View file

@ -17,6 +17,8 @@
package bisq.core.payment.payload;
import bisq.core.locale.Res;
import io.bisq.generated.protobuffer.PB;
import com.google.protobuf.Message;
@ -88,7 +90,7 @@ public final class OKPayAccountPayload extends PaymentAccountPayload {
@Override
public String getPaymentDetails() {
return "OKPay - Account no.: " + accountNr;
return Res.get(paymentMethodId) + " - " + Res.getWithCol("payment.account.no") + " " + accountNr;
}
@Override

4
core/src/main/java/bisq/core/payment/payload/PerfectMoneyAccountPayload.java
View file

@ -17,6 +17,8 @@
package bisq.core.payment.payload;
import bisq.core.locale.Res;
import io.bisq.generated.protobuffer.PB;
import com.google.protobuf.Message;
@ -89,7 +91,7 @@ public final class PerfectMoneyAccountPayload extends PaymentAccountPayload {
@Override
public String getPaymentDetails() {
return "PerfectMoney - Account no.: " + accountNr;
return Res.get(paymentMethodId) + " - " + Res.getWithCol("payment.account.no") + " " + accountNr;
}
@Override

5
core/src/main/java/bisq/core/payment/payload/PopmoneyAccountPayload.java
View file

@ -17,6 +17,8 @@
package bisq.core.payment.payload;
import bisq.core.locale.Res;
import io.bisq.generated.protobuffer.PB;
import com.google.protobuf.Message;
@ -92,7 +94,8 @@ public final class PopmoneyAccountPayload extends PaymentAccountPayload {
@Override
public String getPaymentDetails() {
return "Popmoney - Holder name: " + holderName + ", email or phone no.: " + accountId;
return Res.get(paymentMethodId) + " - " + Res.getWithCol("payment.account.owner") + " " + holderName + ", " +
Res.getWithCol("payment.popmoney.accountId") + " " + accountId;
}
@Override

4
core/src/main/java/bisq/core/payment/payload/PromptPayAccountPayload.java
View file

@ -17,6 +17,8 @@
package bisq.core.payment.payload;
import bisq.core.locale.Res;
import io.bisq.generated.protobuffer.PB;
import com.google.protobuf.Message;
@ -88,7 +90,7 @@ public final class PromptPayAccountPayload extends PaymentAccountPayload {
@Override
public String getPaymentDetails() {
return "PromptPay ID: " + promptPayId;
return Res.getWithCol("payment.promptPay.promptPayId") + promptPayId;
}
@Override

4
core/src/main/java/bisq/core/payment/payload/SameBankAccountPayload.java
View file

@ -17,6 +17,8 @@
package bisq.core.payment.payload;
import bisq.core.locale.Res;
import io.bisq.generated.protobuffer.PB;
import com.google.protobuf.Message;
@ -115,6 +117,6 @@ public final class SameBankAccountPayload extends BankAccountPayload {
@Override
public String getPaymentDetails() {
return "Transfer with same Bank - " + getPaymentDetailsForTradePopup().replace("\n", ", ");
return Res.get(paymentMethodId) + " - " + getPaymentDetailsForTradePopup().replace("\n", ", ");
}
}

7
core/src/main/java/bisq/core/payment/payload/SepaAccountPayload.java
View file

@ -19,6 +19,7 @@ package bisq.core.payment.payload;
import bisq.core.locale.Country;
import bisq.core.locale.CountryUtil;
import bisq.core.locale.Res;
import io.bisq.generated.protobuffer.PB;
@ -146,15 +147,15 @@ public final class SepaAccountPayload extends CountryBasedPaymentAccountPayload
@Override
public String getPaymentDetails() {
return "SEPA - Holder name: " + holderName + ", IBAN: " + iban + ", BIC: " + bic + ", Country code: " + getCountryCode();
return Res.get(paymentMethodId) + " - " + Res.getWithCol("payment.account.owner") + " " + holderName + ", IBAN: " + iban + ", BIC: " + bic + ", " + Res.getWithCol("payment.bank.country") + " " + getCountryCode();
}
@Override
public String getPaymentDetailsForTradePopup() {
return "Holder name: " + holderName + "\n" +
return Res.getWithCol("payment.account.owner") + " " + holderName + "\n" +
"IBAN: " + iban + "\n" +
"BIC: " + bic + "\n" +
"Country of bank: " + CountryUtil.getNameByCode(countryCode);
Res.getWithCol("payment.bank.country") + " " + CountryUtil.getNameByCode(countryCode);
}
@Override

8
core/src/main/java/bisq/core/payment/payload/SepaInstantAccountPayload.java
View file

@ -19,6 +19,7 @@ package bisq.core.payment.payload;
import bisq.core.locale.Country;
import bisq.core.locale.CountryUtil;
import bisq.core.locale.Res;
import io.bisq.generated.protobuffer.PB;
@ -141,15 +142,16 @@ public final class SepaInstantAccountPayload extends CountryBasedPaymentAccountP
@Override
public String getPaymentDetails() {
return "SEPA Instant - Holder name: " + holderName + ", IBAN: " + iban + ", BIC: " + bic + ", Country code: " + getCountryCode();
return Res.get(paymentMethodId) + " - " + Res.getWithCol("payment.account.owner") + " " + holderName + ", IBAN: " +
iban + ", BIC: " + bic + ", " + Res.getWithCol("payment.bank.country") + " " + getCountryCode();
}
@Override
public String getPaymentDetailsForTradePopup() {
return "Holder name: " + holderName + "\n" +
return Res.getWithCol("payment.account.owner") + " " + holderName + "\n" +
"IBAN: " + iban + "\n" +
"BIC: " + bic + "\n" +
"Country of bank: " + CountryUtil.getNameByCode(countryCode);
Res.getWithCol("payment.bank.country") + " " + CountryUtil.getNameByCode(countryCode);
}
@Override

6
core/src/main/java/bisq/core/payment/payload/SpecificBanksAccountPayload.java
View file

@ -17,6 +17,8 @@
package bisq.core.payment.payload;
import bisq.core.locale.Res;
import io.bisq.generated.protobuffer.PB;
import com.google.protobuf.Message;
@ -139,12 +141,12 @@ public final class SpecificBanksAccountPayload extends BankAccountPayload {
@Override
public String getPaymentDetails() {
return "Transfers with specific banks - " + getPaymentDetailsForTradePopup().replace("\n", ", ");
return Res.get(paymentMethodId) + " - " + getPaymentDetailsForTradePopup().replace("\n", ", ");
}
@Override
public String getPaymentDetailsForTradePopup() {
return super.getPaymentDetailsForTradePopup() + "\n" +
"Accepted banks: " + Joiner.on(", ").join(acceptedBanks);
Res.getWithCol("payment.accepted.banks") + " " + Joiner.on(", ").join(acceptedBanks);
}
}

9
core/src/main/java/bisq/core/payment/payload/SwishAccountPayload.java
View file

@ -17,6 +17,8 @@
package bisq.core.payment.payload;
import bisq.core.locale.Res;
import io.bisq.generated.protobuffer.PB;
import com.google.protobuf.Message;
@ -92,13 +94,14 @@ public final class SwishAccountPayload extends PaymentAccountPayload {
@Override
public String getPaymentDetails() {
return "Swish - Holder name: " + holderName + ", mobile no.: " + mobileNr;
return Res.get(paymentMethodId) + " - " + Res.getWithCol("payment.account.owner") + " " + holderName +
", " + Res.getWithCol("payment.mobile") + " " + mobileNr;
}
@Override
public String getPaymentDetailsForTradePopup() {
return "Holder name: " + holderName + "\n" +
"Mobile no.: " + mobileNr;
return Res.getWithCol("payment.account.owner") + " " + holderName + "\n" +
Res.getWithCol("payment.mobile") + " " + mobileNr;
}
@Override

9
core/src/main/java/bisq/core/payment/payload/USPostalMoneyOrderAccountPayload.java
View file

@ -17,6 +17,8 @@
package bisq.core.payment.payload;
import bisq.core.locale.Res;
import io.bisq.generated.protobuffer.PB;
import com.google.protobuf.Message;
@ -94,14 +96,15 @@ public final class USPostalMoneyOrderAccountPayload extends PaymentAccountPayloa
@Override
public String getPaymentDetails() {
return "US Postal Money Order - Holder name: " + holderName + ", postal address: " + postalAddress;
return Res.get(paymentMethodId) + " - " + Res.getWithCol("payment.account.owner") + " " + holderName + ", " +
Res.getWithCol("payment.postal.address") + " " + postalAddress;
}
@Override
public String getPaymentDetailsForTradePopup() {
return "Holder name: " + holderName + "\n" +
"Postal address: " + postalAddress;
return Res.getWithCol("payment.account.owner") + " " + holderName + "\n" +
Res.getWithCol("payment.postal.address") + " " + postalAddress;
}
@Override

4
core/src/main/java/bisq/core/payment/payload/UpholdAccountPayload.java
View file

@ -17,6 +17,8 @@
package bisq.core.payment.payload;
import bisq.core.locale.Res;
import io.bisq.generated.protobuffer.PB;
import com.google.protobuf.Message;
@ -87,7 +89,7 @@ public final class UpholdAccountPayload extends PaymentAccountPayload {
@Override
public String getPaymentDetails() {
return "Uphold - Account: " + accountId;
return Res.get(paymentMethodId) + " - " + Res.getWithCol("payment.account") + " " + accountId;
}
@Override

5
core/src/main/java/bisq/core/payment/payload/VenmoAccountPayload.java
View file

@ -17,6 +17,8 @@
package bisq.core.payment.payload;
import bisq.core.locale.Res;
import io.bisq.generated.protobuffer.PB;
import com.google.protobuf.Message;
@ -94,7 +96,8 @@ public final class VenmoAccountPayload extends PaymentAccountPayload {
@Override
public String getPaymentDetails() {
return "Venmo - Holder name: " + holderName + ", Venmo username: " + venmoUserName;
return Res.get(paymentMethodId) + " - " + Res.getWithCol("payment.account.owner") + " " + holderName + ", " +
Res.getWithCol("payment.venmo.venmoUserName") + " " + venmoUserName;
}
@Override

4
core/src/main/java/bisq/core/payment/payload/WeChatPayAccountPayload.java
View file

@ -17,6 +17,8 @@
package bisq.core.payment.payload;
import bisq.core.locale.Res;
import io.bisq.generated.protobuffer.PB;
import com.google.protobuf.Message;
@ -86,7 +88,7 @@ public final class WeChatPayAccountPayload extends PaymentAccountPayload {
@Override
public String getPaymentDetails() {
return "WeChat Pay - Account no.: " + accountNr;
return Res.get(paymentMethodId) + " - " + Res.getWithCol("payment.account.no") + " " + accountNr;
}
@Override

13
core/src/main/java/bisq/core/payment/payload/WesternUnionAccountPayload.java
View file

@ -19,6 +19,7 @@ package bisq.core.payment.payload;
import bisq.core.locale.BankUtil;
import bisq.core.locale.CountryUtil;
import bisq.core.locale.Res;
import io.bisq.generated.protobuffer.PB;
@ -117,17 +118,17 @@ public class WesternUnionAccountPayload extends CountryBasedPaymentAccountPayloa
@Override
public String getPaymentDetails() {
return "Western Union - " + getPaymentDetailsForTradePopup().replace("\n", ", ");
return Res.get(paymentMethodId) + " - " + getPaymentDetailsForTradePopup().replace("\n", ", ");
}
@Override
public String getPaymentDetailsForTradePopup() {
String cityState = BankUtil.isStateRequired(countryCode) ? ("City / State: " + city + " / " + state + "\n")
: ("City: " + city + "\n");
return "Full name: " + holderName + "\n" +
String cityState = BankUtil.isStateRequired(countryCode) ? (Res.get("payment.account.city") + " / " + Res.getWithCol("payment.account.state") + " " + city + " / " + state + "\n")
: (Res.getWithCol("payment.account.city") + " " + city + "\n");
return Res.getWithCol("payment.account.fullName") + " " + holderName + "\n" +
cityState +
"County: " + CountryUtil.getNameByCode(countryCode) + "\n" +
"Email: " + email;
Res.getWithCol("payment.country") + " " + CountryUtil.getNameByCode(countryCode) + "\n" +
Res.getWithCol("payment.email") + " " + email;
}
@Override

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

@ -589,7 +589,7 @@ The trade ID (\"reason for payment\" text) of the transaction is: \"{2}\"
portfolio.pending.step3_seller.bank=Your trading partner has confirmed that he initiated the {0} payment.\n\n\
Please go to your online banking web page and check if you have received {1} from the BTC buyer.\n\n\
The trade ID (\"reason for payment\" text) of the transaction is: \"{2}\"\n\n
portfolio.pending.step3_seller.cash=\n\nBecause the payment is done via Cash Deposit the BTC buyer has to write \"NO REFUND\" on the paper receipt, tear it in 2 parts and send you a photo by email.\n\n\
portfolio.pending.step3_seller.cash=Because the payment is done via Cash Deposit the BTC buyer has to write \"NO REFUND\" on the paper receipt, tear it in 2 parts and send you a photo by email.\n\n\
To avoid chargeback risk, only confirm if you received the email and if you are sure the paper receipt is valid.\n\
If you are not sure, {0}
portfolio.pending.step3_seller.moneyGram=The buyer has to send you the Authorisation number and a photo of the receipt by email.\n\
@ -2281,6 +2281,7 @@ payment.national.account.id.AR=CBU number
#new
payment.altcoin.address.dyn={0} address
payment.altcoin.receiver.address=Receiver's altcoin address
payment.accountNr=Account number
payment.emailOrMobile=Email or mobile nr
payment.useCustomAccountName=Use custom account name

2
desktop/src/main/java/bisq/desktop/components/paymentmethods/BankForm.java
View file

@ -419,7 +419,7 @@ abstract class BankForm extends GeneralBankForm {
private void addHolderNameAndIdForDisplayAccount() {
String countryCode = bankAccountPayload.getCountryCode();
if (BankUtil.isHolderIdRequired(countryCode)) {
Tuple4<Label, TextField, Label, TextField> tuple = addLabelTextFieldLabelTextField(gridPane, ++gridRow,
Tuple4<Label, TextField, Label, TextField> tuple = addCompactTopLabelTextFieldTopLabelTextField(gridPane, ++gridRow,
Res.get("payment.account.owner"), BankUtil.getHolderIdLabel(countryCode));
TextField holderNameTextField = tuple.second;
holderNameTextField.setText(bankAccountPayload.getHolderName());

37
desktop/src/main/java/bisq/desktop/components/paymentmethods/CashDepositForm.java
View file

@ -18,7 +18,6 @@
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.EmailValidator;
@ -71,7 +70,7 @@ public class CashDepositForm extends GeneralBankForm {
data.getHolderName() + " / " + data.getHolderEmail());
if (!showRequirements)
addCompactTopLabelTextFieldWithCopyIcon(gridPane, getIndexOfColumn(colIndex) == 0 ? ++gridRow : gridRow, getIndexOfColumn(colIndex++), Res.get("payment.bank.country"),
addCompactTopLabelTextFieldWithCopyIcon(gridPane, getIndexOfColumn(colIndex) == 0 ? ++gridRow : gridRow, getIndexOfColumn(colIndex++), Res.getWithCol("payment.bank.country"),
CountryUtil.getNameAndCode(countryCode));
else
requirements += "\n" + Res.get("payment.bank.country") + " " + CountryUtil.getNameAndCode(countryCode);
@ -110,13 +109,13 @@ public class CashDepositForm extends GeneralBankForm {
if (bankNameBankIdCombined) {
addCompactTopLabelTextFieldWithCopyIcon(gridPane, getIndexOfColumn(colIndex) == 0 ? ++gridRow : gridRow, getIndexOfColumn(colIndex++),
bankNameLabel + " / " +
bankIdLabel + ":",
bankIdLabel,
data.getBankName() + " / " + data.getBankId());
}
if (bankNameBranchIdCombined) {
addCompactTopLabelTextFieldWithCopyIcon(gridPane, getIndexOfColumn(colIndex) == 0 ? ++gridRow : gridRow, getIndexOfColumn(colIndex++),
bankNameLabel + " / " +
branchIdLabel + ":",
branchIdLabel,
data.getBankName() + " / " + data.getBranchId());
}
@ -126,7 +125,7 @@ public class CashDepositForm extends GeneralBankForm {
if (!bankNameBankIdCombined && !bankNameBranchIdCombined && !branchIdAccountNrCombined && bankIdBranchIdCombined) {
addCompactTopLabelTextFieldWithCopyIcon(gridPane, getIndexOfColumn(colIndex) == 0 ? ++gridRow : gridRow,
bankIdLabel + " / " +
branchIdLabel + ":",
branchIdLabel,
data.getBankId() + " / " + data.getBranchId());
}
@ -136,7 +135,7 @@ public class CashDepositForm extends GeneralBankForm {
if (!bankNameBranchIdCombined && !bankIdBranchIdCombined && branchIdAccountNrCombined) {
addCompactTopLabelTextFieldWithCopyIcon(gridPane, getIndexOfColumn(colIndex) == 0 ? ++gridRow : gridRow, getIndexOfColumn(colIndex++),
branchIdLabel + " / " +
accountNrLabel + ":",
accountNrLabel,
data.getBranchId() + " / " + data.getAccountNr());
}
@ -196,46 +195,46 @@ public class CashDepositForm extends GeneralBankForm {
String countryCode = cashDepositAccountPayload.getCountryCode();
addTopLabelTextField(gridPane, gridRow, Res.get("payment.account.name"), paymentAccount.getAccountName(), Layout.FIRST_ROW_AND_GROUP_DISTANCE);
FormBuilder.addTopLabelTextField(gridPane, ++gridRow, Res.get("shared.paymentMethod"),
addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("shared.paymentMethod"),
Res.get(paymentAccount.getPaymentMethod().getId()));
FormBuilder.addTopLabelTextField(gridPane, ++gridRow, Res.get("payment.country"),
addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.country"),
getCountryBasedPaymentAccount().getCountry() != null ? getCountryBasedPaymentAccount().getCountry().name : "");
TradeCurrency singleTradeCurrency = paymentAccount.getSingleTradeCurrency();
String nameAndCode = singleTradeCurrency != null ? singleTradeCurrency.getNameAndCode() : "null";
FormBuilder.addTopLabelTextField(gridPane, ++gridRow, Res.get("shared.currency"),
addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("shared.currency"),
nameAndCode);
addHolderNameAndIdForDisplayAccount();
FormBuilder.addTopLabelTextField(gridPane, ++gridRow, Res.get("payment.email"),
addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.email"),
cashDepositAccountPayload.getHolderEmail());
if (BankUtil.isBankNameRequired(countryCode))
FormBuilder.addTopLabelTextField(gridPane, ++gridRow, Res.get("payment.bank.name"),
addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.bank.name"),
cashDepositAccountPayload.getBankName()).second.setMouseTransparent(false);
if (BankUtil.isBankIdRequired(countryCode))
FormBuilder.addTopLabelTextField(gridPane, ++gridRow, BankUtil.getBankIdLabel(countryCode),
addCompactTopLabelTextField(gridPane, ++gridRow, BankUtil.getBankIdLabel(countryCode),
cashDepositAccountPayload.getBankId()).second.setMouseTransparent(false);
if (BankUtil.isBranchIdRequired(countryCode))
FormBuilder.addTopLabelTextField(gridPane, ++gridRow, BankUtil.getBranchIdLabel(countryCode),
addCompactTopLabelTextField(gridPane, ++gridRow, BankUtil.getBranchIdLabel(countryCode),
cashDepositAccountPayload.getBranchId()).second.setMouseTransparent(false);
if (BankUtil.isNationalAccountIdRequired(countryCode))
FormBuilder.addTopLabelTextField(gridPane, ++gridRow, BankUtil.getNationalAccountIdLabel(countryCode),
addCompactTopLabelTextField(gridPane, ++gridRow, BankUtil.getNationalAccountIdLabel(countryCode),
cashDepositAccountPayload.getNationalAccountId()).second.setMouseTransparent(false);
if (BankUtil.isAccountNrRequired(countryCode))
FormBuilder.addTopLabelTextField(gridPane, ++gridRow, BankUtil.getAccountNrLabel(countryCode),
addCompactTopLabelTextField(gridPane, ++gridRow, BankUtil.getAccountNrLabel(countryCode),
cashDepositAccountPayload.getAccountNr()).second.setMouseTransparent(false);
if (BankUtil.isAccountTypeRequired(countryCode))
FormBuilder.addTopLabelTextField(gridPane, ++gridRow, BankUtil.getAccountTypeLabel(countryCode),
addCompactTopLabelTextField(gridPane, ++gridRow, BankUtil.getAccountTypeLabel(countryCode),
cashDepositAccountPayload.getAccountType()).second.setMouseTransparent(false);
String requirements = cashDepositAccountPayload.getRequirements();
boolean showRequirements = requirements != null && !requirements.isEmpty();
if (showRequirements) {
TextArea textArea = addTopLabelTextArea(gridPane, ++gridRow, Res.get("payment.extras"), "").second;
TextArea textArea = addCompactTopLabelTextArea(gridPane, ++gridRow, Res.get("payment.extras"), "").second;
textArea.setMinHeight(30);
textArea.setMaxHeight(30);
textArea.setEditable(false);
@ -466,14 +465,14 @@ public class CashDepositForm extends GeneralBankForm {
private void addHolderNameAndIdForDisplayAccount() {
String countryCode = cashDepositAccountPayload.getCountryCode();
if (BankUtil.isHolderIdRequired(countryCode)) {
Tuple4<Label, TextField, Label, TextField> tuple = FormBuilder.addLabelTextFieldLabelTextField(gridPane, ++gridRow,
Tuple4<Label, TextField, Label, TextField> tuple = addCompactTopLabelTextFieldTopLabelTextField(gridPane, ++gridRow,
Res.get("payment.account.owner"), BankUtil.getHolderIdLabel(countryCode));
TextField holderNameTextField = tuple.second;
holderNameTextField.setText(cashDepositAccountPayload.getHolderName());
holderNameTextField.setMinWidth(300);
tuple.forth.setText(cashDepositAccountPayload.getHolderTaxId());
} else {
FormBuilder.addTopLabelTextField(gridPane, ++gridRow, Res.get("payment.account.owner"),
addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.account.owner"),
cashDepositAccountPayload.getHolderName());
}
}

4
desktop/src/main/java/bisq/desktop/components/paymentmethods/USPostalMoneyOrderForm.java
View file

@ -76,7 +76,7 @@ public class USPostalMoneyOrderForm extends PaymentMethodForm {
postalAddressTextArea = addTopLabelTextArea(gridPane, ++gridRow,
Res.get("payment.postal.address"), "").second;
postalAddressTextArea.setPrefHeight(60);
postalAddressTextArea.setPrefHeight(70);
//postalAddressTextArea.setValidator(usPostalMoneyOrderValidator);
postalAddressTextArea.textProperty().addListener((ov, oldValue, newValue) -> {
usPostalMoneyOrderAccount.setPostalAddress(newValue);
@ -108,7 +108,7 @@ public class USPostalMoneyOrderForm extends PaymentMethodForm {
usPostalMoneyOrderAccount.getHolderName());
TextArea textArea = addCompactTopLabelTextArea(gridPane, ++gridRow, Res.get("payment.postal.address"), "").second;
textArea.setText(usPostalMoneyOrderAccount.getPostalAddress());
textArea.setPrefHeight(60);
textArea.setPrefHeight(70);
textArea.setEditable(false);
TradeCurrency singleTradeCurrency = usPostalMoneyOrderAccount.getSingleTradeCurrency();
String nameAndCode = singleTradeCurrency != null ? singleTradeCurrency.getNameAndCode() : "null";

20
desktop/src/main/java/bisq/desktop/main/overlays/windows/FilterWindow.java
View file

@ -21,7 +21,6 @@ import bisq.desktop.components.AutoTooltipButton;
import bisq.desktop.components.InputTextField;
import bisq.desktop.main.overlays.Overlay;
import bisq.desktop.main.overlays.popups.Popup;
import bisq.desktop.util.FormBuilder;
import bisq.core.filter.Filter;
import bisq.core.filter.FilterManager;
@ -49,6 +48,7 @@ import java.util.stream.Collectors;
import static bisq.desktop.util.FormBuilder.addInputTextField;
import static bisq.desktop.util.FormBuilder.addLabelCheckBox;
import static bisq.desktop.util.FormBuilder.addTopLabelInputTextField;
public class FilterWindow extends Overlay<FilterWindow> {
private SendFilterMessageHandler sendFilterMessageHandler;
@ -126,19 +126,19 @@ public class FilterWindow extends Overlay<FilterWindow> {
if (useDevPrivilegeKeys)
keyInputTextField.setText(DevEnv.DEV_PRIVILEGE_PRIV_KEY);
InputTextField offerIdsInputTextField = FormBuilder.addInputTextField(gridPane, ++rowIndex, Res.get("filterWindow.offers"));
InputTextField nodesInputTextField = FormBuilder.addInputTextField(gridPane, ++rowIndex, Res.get("filterWindow.onions"));
InputTextField offerIdsInputTextField = addInputTextField(gridPane, ++rowIndex, Res.get("filterWindow.offers"));
InputTextField nodesInputTextField = addTopLabelInputTextField(gridPane, ++rowIndex, Res.get("filterWindow.onions")).second;
nodesInputTextField.setPromptText("E.g. zqnzx6o3nifef5df.onion:9999"); // Do not translate
InputTextField paymentAccountFilterInputTextField = FormBuilder.addInputTextField(gridPane, ++rowIndex, Res.get("filterWindow.accounts"));
InputTextField paymentAccountFilterInputTextField = addTopLabelInputTextField(gridPane, ++rowIndex, Res.get("filterWindow.accounts")).second;
GridPane.setHalignment(paymentAccountFilterInputTextField, HPos.RIGHT);
paymentAccountFilterInputTextField.setPromptText("E.g. PERFECT_MONEY|getAccountNr|12345"); // Do not translate
InputTextField bannedCurrenciesInputTextField = FormBuilder.addInputTextField(gridPane, ++rowIndex, Res.get("filterWindow.bannedCurrencies"));
InputTextField bannedPaymentMethodsInputTextField = FormBuilder.addInputTextField(gridPane, ++rowIndex, Res.get("filterWindow.bannedPaymentMethods"));
InputTextField bannedCurrenciesInputTextField = addInputTextField(gridPane, ++rowIndex, Res.get("filterWindow.bannedCurrencies"));
InputTextField bannedPaymentMethodsInputTextField = addTopLabelInputTextField(gridPane, ++rowIndex, Res.get("filterWindow.bannedPaymentMethods")).second;
bannedPaymentMethodsInputTextField.setPromptText("E.g. PERFECT_MONEY"); // Do not translate
InputTextField arbitratorsInputTextField = FormBuilder.addInputTextField(gridPane, ++rowIndex, Res.get("filterWindow.arbitrators"));
InputTextField seedNodesInputTextField = FormBuilder.addInputTextField(gridPane, ++rowIndex, Res.get("filterWindow.seedNode"));
InputTextField priceRelayNodesInputTextField = FormBuilder.addInputTextField(gridPane, ++rowIndex, Res.get("filterWindow.priceRelayNode"));
InputTextField btcNodesInputTextField = FormBuilder.addInputTextField(gridPane, ++rowIndex, Res.get("filterWindow.btcNode"));
InputTextField arbitratorsInputTextField = addInputTextField(gridPane, ++rowIndex, Res.get("filterWindow.arbitrators"));
InputTextField seedNodesInputTextField = addInputTextField(gridPane, ++rowIndex, Res.get("filterWindow.seedNode"));
InputTextField priceRelayNodesInputTextField = addInputTextField(gridPane, ++rowIndex, Res.get("filterWindow.priceRelayNode"));
InputTextField btcNodesInputTextField = addInputTextField(gridPane, ++rowIndex, Res.get("filterWindow.btcNode"));
CheckBox preventPublicBtcNetworkCheckBox = addLabelCheckBox(gridPane, ++rowIndex, Res.get("filterWindow.preventPublicBtcNetwork"));
final Filter filter = filterManager.getDevelopersFilter();

16
desktop/src/main/java/bisq/desktop/util/FormBuilder.java
View file

@ -656,28 +656,28 @@ public class FormBuilder {
// Label + TextField + Label + TextField
///////////////////////////////////////////////////////////////////////////////////////////
public static Tuple4<Label, TextField, Label, TextField> addLabelTextFieldLabelTextField(GridPane gridPane, int rowIndex, String title1, String title2) {
Label label1 = addLabel(gridPane, rowIndex, title1, 0);
public static Tuple4<Label, TextField, Label, TextField> addCompactTopLabelTextFieldTopLabelTextField(GridPane gridPane, int rowIndex, String title1, String title2) {
TextField textField1 = new BisqTextField();
textField1.setEditable(false);
textField1.setMouseTransparent(true);
textField1.setFocusTraversable(false);
Label label2 = new AutoTooltipLabel(title2);
HBox.setMargin(label2, new Insets(5, 0, 0, 0));
final Tuple2<Label, VBox> topLabelWithVBox1 = getTopLabelWithVBox(title1, textField1);
TextField textField2 = new BisqTextField();
textField2.setEditable(false);
textField2.setMouseTransparent(true);
textField2.setFocusTraversable(false);
final Tuple2<Label, VBox> topLabelWithVBox2 = getTopLabelWithVBox(title2, textField2);
HBox hBox = new HBox();
hBox.setSpacing(10);
hBox.getChildren().addAll(textField1, label2, textField2);
hBox.getChildren().addAll(topLabelWithVBox1.second, topLabelWithVBox2.second);
GridPane.setRowIndex(hBox, rowIndex);
GridPane.setColumnIndex(hBox, 1);
gridPane.getChildren().add(hBox);
return new Tuple4<>(label1, textField1, label2, textField2);
return new Tuple4<>(topLabelWithVBox1.first, textField1, topLabelWithVBox2.first, textField2);
}

2
desktop/src/main/java/bisq/desktop/util/GUIUtil.java
View file

@ -404,7 +404,7 @@ public class GUIUtil {
(offerCountOptional.get() == 1 ? postFixSingle : postFixMulti));
numberOfOffers.getStyleClass().add("offer-label-small");
AnchorPane.setRightAnchor(numberOfOffers, 0.0);
AnchorPane.setBottomAnchor(numberOfOffers, 0.0);
AnchorPane.setBottomAnchor(numberOfOffers, 2.0);
pane.getChildren().add(numberOfOffers);
}
}