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

Merge branch 'national-account-email-mismatch' of https://github.com/sqrrm/exchange into sqrrm-national-account-email-mismatch

Browse source
This commit is contained in:
Manfred Karrer 2017-11-14 13:34:18 -05:00
commit 0ad0c74040
No known key found for this signature in database
GPG key ID: 401250966A6B2C46
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
common/src/main/resources/i18n/displayStrings.properties
View file

@ -489,14 +489,14 @@ portfolio.pending.step2_buyer.sellersAddress=Seller''s {0} address:
portfolio.pending.step2_buyer.paymentStarted=Payment started
portfolio.pending.step2_buyer.warn=You still have not done your {0} payment!\nPlease note that the trade has to be completed by {1} otherwise the trade will be investigated by the arbitrator.
portfolio.pending.step2_buyer.openForDispute=You have not completed your payment!\nThe max. period for the trade has elapsed.\n\nPlease contact the arbitrator for opening a dispute.
portfolio.pending.step2_buyer.paperReceipt.headline=Did you sent the paper receipt to the BTC seller?
portfolio.pending.step2_buyer.paperReceipt.headline=Did you send the paper receipt to the BTC seller?
portfolio.pending.step2_buyer.paperReceipt.msg=Remember:\n\
You need to write on the paper receipt: NO REFUNDS.\n\
Then tear it in 2 parts, make a photo and send it to the BTC seller's email address.
portfolio.pending.step2_buyer.westernUnionMTCNInfo.headline=Send MTCN and receipt
portfolio.pending.step2_buyer.westernUnionMTCNInfo.msg=You need to send the MTCN (tracking number) and a photo of the receipt by email to the BTC seller.\n\
The receipt must clearly show the seller's full name, city, country and the amount. The seller''s email is: {0}.\n\n\
Did you sent the MTCN and contract to the seller?
Did you send the MTCN and contract to the seller?
portfolio.pending.step2_buyer.confirmStart.headline=Confirm that you have started the payment
portfolio.pending.step2_buyer.confirmStart.msg=Did you initiate the {0} payment to your trading partner?

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

@ -100,7 +100,7 @@ public final class NationalBankAccountPayload extends BankAccountPayload {
bankAccountPayloadPB.getAccountType().isEmpty() ? null : bankAccountPayloadPB.getAccountType(),
bankAccountPayloadPB.getHolderTaxId().isEmpty() ? null : bankAccountPayloadPB.getHolderTaxId(),
bankAccountPayloadPB.getBankId().isEmpty() ? null : bankAccountPayloadPB.getBankId(),
bankAccountPayloadPB.getEmail().isEmpty() ? null : bankAccountPayloadPB.getEmail(),
bankAccountPayloadPB.getEmail().isEmpty() ? "" : bankAccountPayloadPB.getEmail(),
proto.getMaxTradePeriod(),
CollectionUtils.isEmpty(proto.getExcludeFromJsonDataMap()) ? null : new HashMap<>(proto.getExcludeFromJsonDataMap()));
}

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

@ -101,7 +101,7 @@ public final class SameBankAccountPayload extends BankAccountPayload {
bankAccountPayload.getAccountType().isEmpty() ? null : bankAccountPayload.getAccountType(),
bankAccountPayload.getHolderTaxId().isEmpty() ? null : bankAccountPayload.getHolderTaxId(),
bankAccountPayload.getBankId().isEmpty() ? null : bankAccountPayload.getBankId(),
bankAccountPayload.getEmail().isEmpty() ? null : bankAccountPayload.getEmail(),
bankAccountPayload.getEmail().isEmpty() ? "" : bankAccountPayload.getEmail(),
proto.getMaxTradePeriod(),
CollectionUtils.isEmpty(proto.getExcludeFromJsonDataMap()) ? null : new HashMap<>(proto.getExcludeFromJsonDataMap()));
}

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

@ -113,7 +113,7 @@ public final class SpecificBanksAccountPayload extends BankAccountPayload {
bankAccountPayload.getAccountType().isEmpty() ? null : bankAccountPayload.getAccountType(),
bankAccountPayload.getHolderTaxId().isEmpty() ? null : bankAccountPayload.getHolderTaxId(),
bankAccountPayload.getBankId().isEmpty() ? null : bankAccountPayload.getBankId(),
bankAccountPayload.getEmail().isEmpty() ? null : bankAccountPayload.getEmail(),
bankAccountPayload.getEmail().isEmpty() ? "" : bankAccountPayload.getEmail(),
new ArrayList<>(specificBanksAccountPayload.getAcceptedBanksList()),
proto.getMaxTradePeriod(),
CollectionUtils.isEmpty(proto.getExcludeFromJsonDataMap()) ? null : new HashMap<>(proto.getExcludeFromJsonDataMap()));