Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[1.5.2] Add extra note for amazon gift cards #4977

Merged
merged 3 commits into from
Dec 21, 2020
Merged

[1.5.2] Add extra note for amazon gift cards #4977

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
69fcf9f
Remove automatic setting of first currency from combobox
chimp1984 Dec 19, 2020
814c5d1
Change text at amazon gift card popup
chimp1984 Dec 19, 2020
cccaa0a
Update popup text
chimp1984 Dec 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions core/src/main/resources/i18n/displayStrings.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3315,10 +3315,14 @@ payment.payid.info=A PayID like a phone number, email address or an Australian B
bank, credit union or building society account. You need to have already created a PayID with your Australian financial institution. \
Both sending and receiving financial institutions must support PayID. For more information please check [HYPERLINK:https://payid.com.au/faqs/]
payment.amazonGiftCard.info=To pay with Amazon eGift Card you need to purchase an Amazon eGift Card at your Amazon account and \
use the BTC seller''s email or mobile nr. as receiver. Amazon sends then an email or text message to the receiver. \
Use the trade ID for the message field.\n\n\
Amazon eGift Cards can only be redeemed by Amazon accounts with the same currency.\n\n\
For more information visit the Amazon eGift Card webpage. [HYPERLINK:https://www.amazon.com/Amazon-1_US_Email-eGift-Card/dp/B004LLIKVU]
use the BTC seller''s email or mobile nr. as receiver. Amazon sends then an email or text message to the receiver.\n\
Amazon eGift Cards can only be redeemed by Amazon accounts with the same currency.\n\
For more information visit the Amazon eGift Card webpage. [HYPERLINK:https://www.amazon.com/Amazon-1_US_Email-eGift-Card/dp/B004LLIKVU]\n\n\
It is recommended to not send more than 100 USD per gift card as it seems that Amazon is considering higher amounts as \
risky and often flags such transactions as fraudulent.\n\
Split the amount up to several smaller amounts and use some creative reference text instead of the trade ID (e.g. 'Happy birthday Susan').\n\
Exchange in the trade chat with the peer which reference text you have used so they are able to \
assign the payment to the trade.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it would be good if @m52go could have a look at this text to make it easier to understand. Might help avoid some mediation cases.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Agree!


# We use constants from the code so we do not use our normal naming convention
# dynamic values are not recognized by IntelliJ
Expand Down
1 change: 0 additions & 1 deletion desktop/src/main/java/bisq/desktop/components/paymentmethods/AmazonGiftCardForm.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@ public AmazonGiftCardForm(PaymentAccount paymentAccount,
public void addTradeCurrency() {
addTradeCurrencyComboBox();
currencyComboBox.setItems(FXCollections.observableArrayList(CurrencyUtil.getAllAmazonGiftCardCurrencies()));
currencyComboBox.getSelectionModel().select(0);
}

@Override
Expand Down
1 change: 0 additions & 1 deletion desktop/src/main/java/bisq/desktop/components/paymentmethods/PerfectMoneyForm.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@ public PerfectMoneyForm(PaymentAccount paymentAccount, AccountAgeWitnessService
public void addTradeCurrency() {
addTradeCurrencyComboBox();
currencyComboBox.setItems(FXCollections.observableArrayList(new FiatCurrency("USD"), new FiatCurrency("EUR")));
currencyComboBox.getSelectionModel().select(0);
}

@Override
Expand Down