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.

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

Add credit card support and change copy #3703

Merged
merged 22 commits into from
Mar 15, 2022
Merged
Show file tree
Hide file tree
Changes from 21 commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
d0ad75b
Add credit card support and change copy
Fatxx Feb 7, 2022
e8f736f
Merge branch 'main' into fix/apple-pay-credit-card-support
blackdevelopa Feb 9, 2022
9fd26cc
Merge branch 'main' into fix/apple-pay-credit-card-support
blackdevelopa Feb 10, 2022
777585a
Merge branch 'main' into fix/apple-pay-credit-card-support
Feb 16, 2022
9a87d8b
Merge branch 'main' into fix/apple-pay-credit-card-support
Feb 16, 2022
d3967c5
Merge branch 'main' into fix/apple-pay-credit-card-support
Fatxx Feb 17, 2022
f629927
Merge branch 'main' into fix/apple-pay-credit-card-support
Feb 22, 2022
a3e97ab
Merge branch 'main' into fix/apple-pay-credit-card-support
Mar 1, 2022
0910fbb
Merge branch 'main' into fix/apple-pay-credit-card-support
Fatxx Mar 1, 2022
899a168
Merge branch 'main' into fix/apple-pay-credit-card-support
Mar 2, 2022
50b2c1c
Merge branch 'main' into fix/apple-pay-credit-card-support
Mar 6, 2022
5240de6
Upgrade version and build number
Mar 8, 2022
f92126f
Merge branch 'main' of https://github.com/MetaMask/metamask-mobile in…
Mar 8, 2022
5d17dcf
Upgrade version and build number
Mar 8, 2022
74bcb08
Merge branch 'main' into fix/apple-pay-credit-card-support
Fatxx Mar 10, 2022
1466072
Improve missleading copy when fiat orders fails
Fatxx Mar 10, 2022
d85f485
Merge branch 'fix/apple-pay-credit-card-support' of https://github.co…
Fatxx Mar 10, 2022
e5cac90
Revert version to match main branch
Fatxx Mar 10, 2022
e606672
Remove space
Fatxx Mar 10, 2022
9b9640c
Add space
Fatxx Mar 10, 2022
5a39800
build.gradle equals main
Fatxx Mar 10, 2022
a7c0533
Merge branch 'main' into fix/apple-pay-credit-card-support
cortisiko Mar 15, 2022
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
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ const WyreApplePayPaymentMethod = ({ onPress }) => {
<ApplePayMark />
</PaymentMethod.Title>
<Text bold>{strings('fiat_on_ramp.fast_plus_lower_fees')}</Text>
<Text>{strings('fiat_on_ramp.debit_card_required')}</Text>
<Text>{strings('fiat_on_ramp.cards_type_required')}</Text>
<TouchableOpacity onPress={showModal}>
<PaymentMethod.InfoIconLine>
<Text>
Expand Down
2 changes: 2 additions & 0 deletions app/components/UI/FiatOrders/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -70,13 +70,15 @@ export const getNotificationDetails = (fiatOrder) => {
title: strings('fiat_on_ramp.notifications.purchase_failed_title', {
currency: fiatOrder.cryptocurrency,
}),
description: strings('fiat_on_ramp.notifications.purchase_failed_description'),
status: 'error',
};
}
case FIAT_ORDER_STATES.CANCELLED: {
return {
...baseNotificationDetails,
title: strings('fiat_on_ramp.notifications.purchase_cancelled_title'),
description: strings('fiat_on_ramp.notifications.purchase_cancelled_description'),
status: 'cancelled',
};
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -533,7 +533,7 @@ const paymentOptions = {
requestPayerPhone: true,
requestPayerEmail: true,
requestBilling: true,
merchantCapabilities: ['debit'],
merchantCapabilities: ['debit', 'credit'],
};

const createPayload = (network, amount, address, currency, paymentDetails) => {
Expand Down
4 changes: 3 additions & 1 deletion locales/languages/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -1409,7 +1409,7 @@
"no_countries_result": "No supported countries match “{{searchString}}”",
"wyre_loading_rates": " ",
"fast_plus_lower_fees": "Fast + lower fees",
"debit_card_required": "Lower fees, Debit card required",
"cards_type_required": "Visa or Mastercard only",
"select_card_country": "Select the country where your card is registered (not where you are located).",
"search_country": "Search for a country",
"wyre_countries": "🇺🇸 U.S. + 33 countries, fees & limits vary",
Expand All @@ -1433,7 +1433,9 @@
"plus_fee": "Plus a {{fee}} fee",
"notifications": {
"purchase_failed_title": "Purchase of {{currency}} has failed! Please try again, sorry for the inconvenience!",
"purchase_failed_description": "Verify your payment method and card support",
"purchase_cancelled_title": "Your purchase was cancelled",
"purchase_cancelled_description": "Verify your payment method and card support",
"purchase_completed_title": "Your purchase of {{amount}} {{currency}} was successful!",
"purchase_completed_description": "Your {{currency}} is now available",
"purchase_pending_title": "Processing your purchase of {{currency}}",
Expand Down
1 change: 0 additions & 1 deletion locales/languages/es.json
Original file line number Diff line number Diff line change
Expand Up @@ -1334,7 +1334,6 @@
"no_countries_result": "Los países bi admitidos coinciden con “{{searchString}}”",
"wyre_loading_rates": " ",
"fast_plus_lower_fees": "Rápido y menores cuotas",
"debit_card_required": "Menores cuotas, se requiere tarjeta de débito",
"select_card_country": "Seleccione el país donde esté registrada su tarjeta (no donde usted se encuentre).",
"search_country": "Buscar un país",
"wyre_countries": " EE. UU. Más de 33 países, las cuotas y los límites varían",
Expand Down
1 change: 0 additions & 1 deletion locales/languages/hi-in.json
Original file line number Diff line number Diff line change
Expand Up @@ -1334,7 +1334,6 @@
"no_countries_result": "किसी समर्थित देश का {{searchString}} से मिलान नहीं हुआ",
"wyre_loading_rates": " ",
"fast_plus_lower_fees": "तेज़ + कम शुल्क",
"debit_card_required": "कम शुल्क, डेबिट कार्ड ज़रूरी",
"select_card_country": "उस देश का चयन करें जहां आपका कार्ड पंजीकृत है (वह नहीं जहां आप मौजूद हैं)।",
"search_country": "किसी देश को खोजें",
"wyre_countries": " U.S. + 33 देश, शुल्क और सीमाएँ अलग-अलग होती हैं",
Expand Down
1 change: 0 additions & 1 deletion locales/languages/id-id.json
Original file line number Diff line number Diff line change
Expand Up @@ -1334,7 +1334,6 @@
"no_countries_result": "Tidak ada negara yang didukung yang cocok “{{searchString}}”",
"wyre_loading_rates": " ",
"fast_plus_lower_fees": "Biaya Cepat + lambat",
"debit_card_required": "Biaya lebih rendah, diperlukan kartu debit",
"select_card_country": "Pilih negara tempat kartu Anda terdaftar (bukan tempat Anda berlokasi).",
"search_country": "Cari negara",
"wyre_countries": " AS + 33 negara, biaya & batasan berbeda",
Expand Down
1 change: 0 additions & 1 deletion locales/languages/ja-jp.json
Original file line number Diff line number Diff line change
Expand Up @@ -1334,7 +1334,6 @@
"no_countries_result": "サポートされている国の一致がありません “{{searchString}}”",
"wyre_loading_rates": " ",
"fast_plus_lower_fees": "高速 + 低い手数料",
"debit_card_required": "低い手数料。デビット カードが必要です。",
"select_card_country": "カードが登録されている国を選択してください (お客様の所在地ではありません)。",
"search_country": "国の検索",
"wyre_countries": " 米国 + 33 か国以上。手数料と限度額は異なります",
Expand Down
1 change: 0 additions & 1 deletion locales/languages/ko-kr.json
Original file line number Diff line number Diff line change
Expand Up @@ -1334,7 +1334,6 @@
"no_countries_result": "지원 국가 가운데 “{{searchString}}” 없음",
"wyre_loading_rates": " ",
"fast_plus_lower_fees": "빠른 속도 + 낮은 수수료",
"debit_card_required": "낮은 수수료, 체크카드 필요",
"select_card_country": "카드가 등록된 국가를 선택하십시오(거주 국가가 아님).",
"search_country": "국가 검색",
"wyre_countries": " U.S. + 33개가 넘는 국가, 수수료와 한도 상이",
Expand Down
1 change: 0 additions & 1 deletion locales/languages/pt-br.json
Original file line number Diff line number Diff line change
Expand Up @@ -1334,7 +1334,6 @@
"no_countries_result": "Nenhum país disponível correspondente a “{{searchString}}”",
"wyre_loading_rates": " ",
"fast_plus_lower_fees": "Taxas rápidas e mais baixas",
"debit_card_required": "Menores taxas, Cartão de débito necessário",
"select_card_country": "Selecione o país onde o seu cartão está registrado (e não aonde você se encontra).",
"search_country": "Pesquisar por país",
"wyre_countries": " U.S. + 33 países, taxas & limites variam",
Expand Down
1 change: 0 additions & 1 deletion locales/languages/ru-ru.json
Original file line number Diff line number Diff line change
Expand Up @@ -1334,7 +1334,6 @@
"no_countries_result": "Нет совпадений с «{{searchString}}» в поддерживаемых странах",
"wyre_loading_rates": " ",
"fast_plus_lower_fees": "Быстро + низкие сборы",
"debit_card_required": "Низкие сборы, требуется дебетовая карта",
"select_card_country": "Выберите страну, в которой зарегистрирована ваша карта (а не ту, где вы находитесь).",
"search_country": "Поиск страны",
"wyre_countries": " США + 33 страны, сборы и лимиты различаются",
Expand Down
1 change: 0 additions & 1 deletion locales/languages/tl.json
Original file line number Diff line number Diff line change
Expand Up @@ -1334,7 +1334,6 @@
"no_countries_result": "Walang sinusuportahang bansa ang tumutugma sa “{{searchString}}”",
"wyre_loading_rates": " ",
"fast_plus_lower_fees": "Mabilis + mas maliliit na bayarin",
"debit_card_required": "Mas maliliit na bayarin, Kailangan ng debit card",
"select_card_country": "Piliin ang bansa kung saan naka-register ang iyong card (hindi ang lokasyon kung nasaan ka).",
"search_country": "Maghanap ng bansa",
"wyre_countries": " U.S. + 33 bansa, iba-iba ang mga bayarin at limitasyon",
Expand Down
1 change: 0 additions & 1 deletion locales/languages/vi-vn.json
Original file line number Diff line number Diff line change
Expand Up @@ -1334,7 +1334,6 @@
"no_countries_result": "Không tìm thấy quốc gia được hỗ trợ nào khớp với “{{searchString}}”",
"wyre_loading_rates": " ",
"fast_plus_lower_fees": "Nhanh + phí thấp hơn",
"debit_card_required": "Phí thấp hơn, cần có thẻ ghi nợ",
"select_card_country": "Chọn quốc gia phát hành thẻ của bạn (không phải nơi bạn cư trú).",
"search_country": "Tìm kiếm quốc gia",
"wyre_countries": " Hoa Kỳ + 33 quốc gia, phí và hạn mức không giống nhau",
Expand Down