From 622914fd6159d5408c3817f9e4f210453cb289d5 Mon Sep 17 00:00:00 2001
From: Godwin Asuquo <41484542+godilite@users.noreply.github.com>
Date: Tue, 19 Jul 2022 19:09:44 +0300
Subject: [PATCH 1/4] CW-128 marketplace screen text changes (#416)

* Change text on marketplace

* fix build issues

* fix build
---
 res/values/strings_de.arb |  6 +++---
 res/values/strings_en.arb |  6 +++---
 res/values/strings_es.arb |  8 ++++----
 res/values/strings_fr.arb |  6 +++---
 res/values/strings_hi.arb |  6 +++---
 res/values/strings_hr.arb |  4 ++--
 res/values/strings_it.arb |  4 ++--
 res/values/strings_ja.arb | 10 +++++-----
 res/values/strings_ko.arb |  6 +++---
 res/values/strings_nl.arb |  8 ++++----
 res/values/strings_pl.arb | 10 +++++-----
 res/values/strings_pt.arb |  4 ++--
 res/values/strings_ru.arb |  6 +++---
 res/values/strings_uk.arb |  6 +++---
 res/values/strings_zh.arb |  4 ++--
 15 files changed, 47 insertions(+), 47 deletions(-)

diff --git a/res/values/strings_de.arb b/res/values/strings_de.arb
index fb56dbd47..cbf45b161 100644
--- a/res/values/strings_de.arb
+++ b/res/values/strings_de.arb
@@ -532,8 +532,8 @@
   "new_template" : "neue Vorlage",
   "electrum_address_disclaimer": "Wir generieren jedes Mal neue Adressen, wenn Sie eine verwenden, aber vorherige Adressen funktionieren weiterhin",
   "market_place": "Marktplatz",
-  "cake_pay_title": "Geschenkkarten und Debitkarten",
-  "cake_pay_subtitle": "Geschenkkarten kaufen und Nicht-KYC-Debitkarten aufladen",
+  "cake_pay_title": "Cake Pay-Geschenkkarten",
+  "cake_pay_subtitle": "Geschenkkarten kaufen und sofort einlösen",
   "about_cake_pay": "CakePay macht es einfach, Geschenkkarten zu kaufen und Prepaid-Debitkarten mit Kryptowährungen aufzuladen, die bei Millionen von Händlern in den Vereinigten Staaten ausgegeben werden können.",
   "cake_pay_account_note": "Erstellen Sie ein Konto, um die verfügbaren Karten zu sehen. Einige sind sogar mit Rabatt erhältlich!",
   "already_have_account": "Sie haben bereits ein Konto?",
@@ -581,7 +581,7 @@
   "add_fund_to_card": "Voeg prepaid tegoed toe aan de kaarten (tot ${value})",
   "use_card_info_two": "Tegoeden worden omgezet naar USD wanneer ze op de prepaid-rekening staan, niet in digitale valuta.",
   "use_card_info_three": "Gebruik de digitale kaart online of met contactloze betaalmethoden.",
-  "optioneel_order_card": "Optioneel een fysieke kaart bestellen.",
+  "optionally_order_card": "Optioneel een fysieke kaart bestellen.",
   "hide_details" : "Details verbergen", 
   "show_details" : "Toon details",
   "upto": "tot ${value}",
diff --git a/res/values/strings_en.arb b/res/values/strings_en.arb
index 80421655c..f49446d04 100644
--- a/res/values/strings_en.arb
+++ b/res/values/strings_en.arb
@@ -531,9 +531,9 @@
   "search": "Search",
   "new_template" : "New Template",
   "electrum_address_disclaimer": "We generate new addresses each time you use one, but previous addresses continue to work",
-  "market_place": "Market place",
-  "cake_pay_title": "Gift cards and debit cards",
-  "cake_pay_subtitle": "Buy gift cards and top up no-KYC debit cards",
+  "market_place": "Marketplace",
+  "cake_pay_title": "Cake Pay Gift Cards",
+  "cake_pay_subtitle": "Buy gift cards and redeem instantly",
   "about_cake_pay": "CakePay allows you to easily buy gift cards and load up prepaid debit cards with cryptocurrencies, spendable at millions of merchants in the United States.",
   "cake_pay_account_note": "Make an account to see the available cards. Some are even available at a discount!",
   "already_have_account": "Already have an account?",
diff --git a/res/values/strings_es.arb b/res/values/strings_es.arb
index 4fd603f01..88b328e9b 100644
--- a/res/values/strings_es.arb
+++ b/res/values/strings_es.arb
@@ -531,9 +531,9 @@
   "search": "Búsqueda",
   "new_template" : "Nueva plantilla",
   "electrum_address_disclaimer": "Generamos nuevas direcciones cada vez que usa una, pero las direcciones anteriores siguen funcionando",
-  "market_place": "Lugar de mercado",
-  "cake_pay_title": "Tarjetas de regalo y tarjetas de débito",
-  "cake_pay_subtitle": "Compre tarjetas de regalo y recargue tarjetas de débito sin KYC",
+  "market_place": "Mercado",
+  "cake_pay_title": "Tarjetas de regalo Cake Pay",
+  "cake_pay_subtitle": "Compra tarjetas de regalo y canjéalas al instante",
   "about_cake_pay": "CakePay te permite comprar fácilmente tarjetas de regalo y cargar tarjetas de débito prepagas con criptomonedas, gastables en millones de comerciantes en los Estados Unidos.",
   "cake_pay_account_note": "Crea una cuenta para ver las tarjetas disponibles. ¡Algunas incluso están disponibles con descuento!",
   "already_have_account": "¿Ya tienes una cuenta?",
@@ -581,7 +581,7 @@
   "add_fund_to_card": "Agregar fondos prepagos a las tarjetas (hasta ${value})",
   "use_card_info_two": "Los fondos se convierten a USD cuando se mantienen en la cuenta prepaga, no en monedas digitales.",
   "use_card_info_three": "Utilice la tarjeta digital en línea o con métodos de pago sin contacto.",
-  "Optionally_order_card": "Opcionalmente pide una tarjeta física.",
+  "optionally_order_card": "Opcionalmente pide una tarjeta física.",
   "hide_details" : "Ocultar detalles",
   "show_details": "Mostrar detalles",
   "upto": "hasta ${value}",
diff --git a/res/values/strings_fr.arb b/res/values/strings_fr.arb
index 2d8310b65..fa4dd6bfc 100644
--- a/res/values/strings_fr.arb
+++ b/res/values/strings_fr.arb
@@ -529,9 +529,9 @@
 
   "new_template" : "Nouveau Modèle",
   "electrum_address_disclaimer": "Nous générons de nouvelles adresses à chaque fois que vous en utilisez une, mais les adresses précédentes continuent à fonctionner",
-  "market_place": "Place du marché",
-  "cake_pay_title": "Cartes cadeaux et cartes de débit",
-  "cake_pay_subtitle": "Achetez des cartes-cadeaux et rechargez des cartes de débit sans KYC",
+  "market_place": "Place de marché",
+  "cake_pay_title": "Cartes cadeaux Cake Pay",
+  "cake_pay_subtitle": "Achetez des cartes-cadeaux et échangez-les instantanément",
   "about_cake_pay": "CakePay vous permet d'acheter facilement des cartes-cadeaux et de charger des cartes de débit prépayées avec des crypto-monnaies, utilisables chez des millions de marchands aux États-Unis.",
   "cake_pay_account_note": "Créez un compte pour voir les cartes disponibles. Certaines sont même disponibles à prix réduit !",
   "already_have_account": "Vous avez déjà un compte ?",
diff --git a/res/values/strings_hi.arb b/res/values/strings_hi.arb
index 85b497352..78a7ec422 100644
--- a/res/values/strings_hi.arb
+++ b/res/values/strings_hi.arb
@@ -531,9 +531,9 @@
   "search": "खोज",
   "new_template" : "नया टेम्पलेट",
   "electrum_address_disclaimer": "हर बार जब आप एक का उपयोग करते हैं तो हम नए पते उत्पन्न करते हैं, लेकिन पिछले पते काम करना जारी रखते हैं",
-  "market_place": "मार्केट प्लेस",
-  "cake_pay_title": "उपहार कार्ड और डेबिट कार्ड",
-  "cake_pay_subtitle": "गिफ्ट कार्ड खरीदें और नो-केवाईसी डेबिट कार्ड टॉप अप करें",
+  "market_place": "मार्केटप्लेस",
+  "cake_pay_title": "केक पे गिफ्ट कार्ड्स",
+  "cake_pay_subtitle": "उपहार कार्ड खरीदें और तुरंत रिडीम करें",
   "about_cake_pay": "केकपे आपको आसानी से उपहार कार्ड खरीदने और क्रिप्टोकरंसी के साथ प्रीपेड डेबिट कार्ड लोड करने की अनुमति देता है, जो संयुक्त राज्य में लाखों व्यापारियों पर खर्च करने योग्य है।",
   "cake_pay_account_note": "उपलब्ध कार्ड देखने के लिए एक खाता बनाएं। कुछ छूट पर भी उपलब्ध हैं!",
   "ready_have_account": "क्या आपके पास पहले से ही एक खाता है?",
diff --git a/res/values/strings_hr.arb b/res/values/strings_hr.arb
index 5bb1c05b4..2187b889d 100644
--- a/res/values/strings_hr.arb
+++ b/res/values/strings_hr.arb
@@ -532,8 +532,8 @@
   "new_template" : "novi predložak",
   "electrum_address_disclaimer": "Minden egyes alkalommal új címeket generálunk, de a korábbi címek továbbra is működnek",
   "market_place": "Tržnica",
-  "cake_pay_title": "Poklon kartice i debitne kartice",
-  "cake_pay_subtitle": "Kupite darovne kartice i nadopunite debitne kartice bez KYC-a",
+  "cake_pay_title": "Cake Pay poklon kartice",
+  "cake_pay_subtitle": "Kupite darovne kartice i odmah ih iskoristite",
   "about_cake_pay": "CakePay vam omogućuje jednostavnu kupnju darovnih kartica i punjenje unaprijed plaćenih debitnih kartica kriptovalutama koje možete potrošiti kod milijuna trgovaca u Sjedinjenim Državama.",
   "cake_pay_account_note": "Napravite račun da vidite dostupne kartice. Neke su čak dostupne uz popust!",
   "already_have_account": "Već imate račun?",
diff --git a/res/values/strings_it.arb b/res/values/strings_it.arb
index b10e3fce2..b85f79766 100644
--- a/res/values/strings_it.arb
+++ b/res/values/strings_it.arb
@@ -532,8 +532,8 @@
   "new_template" : "Nuovo modello",
   "electrum_address_disclaimer": "Generiamo nuovi indirizzi ogni volta che ne utilizzi uno, ma gli indirizzi precedenti continuano a funzionare",
   "market_place": "Mercato",
-  "cake_pay_title": "Carte regalo e carte di debito",
-  "cake_pay_subtitle": "Acquista carte regalo e ricarica carte di debito senza KYC",
+  "cake_pay_title": "Carte regalo Cake Pay",
+  "cake_pay_subtitle": "Acquista carte regalo e riscattale all'istante",
   "about_cake_pay": "CakePay ti consente di acquistare facilmente buoni regalo e caricare carte di debito prepagate con criptovalute, spendibili presso milioni di commercianti negli Stati Uniti.",
   "cake_pay_account_note": "Crea un account per vedere le carte disponibili. Alcune sono anche disponibili con uno sconto!",
   "already_have_account": "Hai già un account?",
diff --git a/res/values/strings_ja.arb b/res/values/strings_ja.arb
index 970c25ecb..882ed330c 100644
--- a/res/values/strings_ja.arb
+++ b/res/values/strings_ja.arb
@@ -531,9 +531,9 @@
   "search": "検索",
   "new_template" : "新しいテンプレート",
   "electrum_address_disclaimer": "使用するたびに新しいアドレスが生成されますが、以前のアドレスは引き続き機能します",
-  "market_place": "マーケットプレイス",
-  "cake_pay_title": "ギフトカードとデビットカード",
-  "cake_pay_subtitle": "ギフトカードを購入し、KYCなしのデビットカードを補充する",
+  "market_place": "Marketplace",
+  "cake_pay_title": "ケーキペイギフトカード",
+  "cake_pay_subtitle": "ギフトカードを購入してすぐに利用できます",
   "about_cake_pay": "CakePayを使用すると、ギフトカードを簡単に購入し、米国内の数百万の加盟店で使用できる暗号通貨を使用してプリペイドデビットカードをロードできます。",
   "cake_pay_account_note": "アカウントを作成して、利用可能なカードを確認してください。割引価格で利用できるカードもあります！",
   "already_have_account": "すでにアカウントをお持ちですか？",
@@ -567,8 +567,8 @@
   "enter_code": "コードを入力",
   "congratulations": "おめでとうございます！",
   "you_now_have_debit_card": "デビットカードができました",
-  "min_amount": "最小: {value}",
-  "max_amount": "最大: {value}",
+  "min_amount": "最小: ${value}",
+  "max_amount": "最大: ${value}",
   "enter_amount": "金額を入力",
   "billing_address_info": "請求先住所を尋ねられた場合は、配送先住所を入力してください",
   "order_physical_card": "物理カードの注文",
diff --git a/res/values/strings_ko.arb b/res/values/strings_ko.arb
index f3d19855a..39a092b12 100644
--- a/res/values/strings_ko.arb
+++ b/res/values/strings_ko.arb
@@ -531,9 +531,9 @@
   "search": "찾다",
   "new_template" : "새 템플릿",
   "electrum_address_disclaimer": "사용할 때마다 새 주소가 생성되지만 이전 주소는 계속 작동합니다.",
-  "market_place": "시장",
-  "cake_pay_title": "기프트 카드 및 직불 카드",
-  "cake_pay_subtitle": "기프트 카드를 구매하고 KYC가 없는 직불 카드를 충전하세요.",
+  "market_place": "마켓플레이스",
+  "cake_pay_title": "케이크 페이 기프트 카드",
+  "cake_pay_subtitle": "기프트 카드를 구매하고 즉시 사용",
   "about_cake_pay": "CakePay를 사용하면 기프트 카드를 쉽게 구매하고 미국의 수백만 판매자에서 사용할 수 있는 암호화폐가 포함된 선불 직불 카드를 충전할 수 있습니다.",
   "cake_pay_account_note": "사용 가능한 카드를 보려면 계정을 만드십시오. 일부는 할인된 가격으로 사용 가능합니다!",
   "already_have_account": "이미 계정이 있습니까?",
diff --git a/res/values/strings_nl.arb b/res/values/strings_nl.arb
index 0bdc0e129..f4d879120 100644
--- a/res/values/strings_nl.arb
+++ b/res/values/strings_nl.arb
@@ -532,8 +532,8 @@
   "new_template" : "Nieuwe sjabloon",
   "electrum_address_disclaimer": "We generate new addresses each time you use one, but previous addresses continue to work",
   "market_place": "Marktplaats",
-  "cake_pay_title": "Cadeaukaarten en debetkaarten",
-  "cake_pay_subtitle": "Koop cadeaubonnen en herlaad niet-KYC-betaalkaarten",
+  "cake_pay_title": "Cake Pay-cadeaubonnen",
+  "cake_pay_subtitle": "Koop cadeaubonnen en wissel ze direct in",
   "about_cake_pay": "Met CakePay kun je gemakkelijk cadeaubonnen kopen en prepaid-betaalkaarten opladen met cryptocurrencies, te besteden bij miljoenen verkopers in de Verenigde Staten.",
   "cake_pay_account_note": "Maak een account aan om de beschikbare kaarten te zien. Sommige zijn zelfs met korting verkrijgbaar!",
   "already_have_account": "Heb je al een account?",
@@ -584,7 +584,7 @@
   "optional_order_card": "Optional eine physische Karte bestellen.",
   "hide_details": "Details ausblenden",
   "show_details": "Details anzeigen",
-  "bis": "bis zu ${value}",
+  "upto": "bis zu ${value}",
   "discount": "${value} % sparen",
   "gift_card_amount": "Gutscheinbetrag",
   "bill_amount": "Rechnungsbetrag",
@@ -619,7 +619,7 @@
   "more_options": "Weitere Optionen",
   "waiting_payment_confirmation": "Warte auf Zahlungsbestätigung",
   "transaction_sent_notice": "Wenn der Bildschirm nach 1 Minute nicht weitergeht, überprüfen Sie einen Block-Explorer und Ihre E-Mail.",
-  "stimme zu": "stimme zu",
+  "agree": "stimme zu",
   "in_store": "Im Geschäft",
   "generating_gift_card": "Geschenkkarte wird erstellt",
   "payment_was_received": "Ihre Zahlung ist eingegangen.",
diff --git a/res/values/strings_pl.arb b/res/values/strings_pl.arb
index f5f22716d..ea31bcef8 100644
--- a/res/values/strings_pl.arb
+++ b/res/values/strings_pl.arb
@@ -535,8 +535,8 @@
   "new_template" : "Nowy szablon",
   "electrum_address_disclaimer": "Za każdym razem, gdy korzystasz z jednego z nich, generujemy nowe adresy, ale poprzednie adresy nadal działają",
   "market_place": "Rynek",
-  "cake_pay_title": "Karty podarunkowe i debetowe",
-  "cake_pay_subtitle": "Kup karty podarunkowe i doładuj karty debetowe bez KYC",
+  "cake_pay_title": "Karty podarunkowe Cake Pay",
+  "cake_pay_subtitle": "Kup karty podarunkowe i wykorzystaj je natychmiast",
   "about_cake_pay": "CakePay umożliwia łatwe kupowanie kart podarunkowych i doładowanie przedpłaconych kart debetowych kryptowalutami, które można wydać u milionów sprzedawców w Stanach Zjednoczonych.",
   "cake_pay_account_note": "Załóż konto, aby zobaczyć dostępne karty. Niektóre są nawet dostępne ze zniżką!",
   "already_have_account": "Masz już konto?",
@@ -584,11 +584,11 @@
   "add_fund_to_card": "Dodaj przedpłacone środki do kart (do ${value})",
   "use_card_info_two": "Środki są przeliczane na USD, gdy są przechowywane na koncie przedpłaconym, a nie w walutach cyfrowych.",
   "use_card_info_three": "Użyj cyfrowej karty online lub za pomocą zbliżeniowych metod płatności.",
-  "opcjonalne_zamówienie_card": "Opcjonalnie zamów kartę fizyczną.",
+  "optionally_order_card": "Opcjonalnie zamów kartę fizyczną.",
   "hide_details" : "Ukryj szczegóły",
   "show_details" : "Pokaż szczegóły",
   "upto": "do ${value}",
-  "discount": "Zaoszczędź {value}% $",
+  "discount": "Zaoszczędź ${value}%",
   "gift_card_amount": "Kwota karty podarunkowej",
   "bill_amount": "Kwota rachunku",
   "you_pay": "Płacisz",
@@ -615,7 +615,7 @@
   "gift_card_redeemed_note": "Karty podarunkowe, które wykorzystałeś, pojawią się tutaj",
   "logout": "Wyloguj",
   "add_tip": "Dodaj wskazówkę",
-  "percentageOf": "z {amount} $",
+  "percentageOf": "z ${amount}",
   "is_percentage": "jest",
   "search_category": "Kategoria wyszukiwania",
   "mark_as_redeemed": "Oznacz jako wykorzystany",
diff --git a/res/values/strings_pt.arb b/res/values/strings_pt.arb
index 6f70efd00..9dee3ca4b 100644
--- a/res/values/strings_pt.arb
+++ b/res/values/strings_pt.arb
@@ -532,8 +532,8 @@
   "new_template" : "Novo modelo",
   "electrum_address_disclaimer": "Geramos novos endereços cada vez que você usa um, mas os endereços anteriores continuam funcionando",
   "market_place": "Mercado",
-  "cake_pay_title": "Cartões de presente e cartões de débito",
-  "cake_pay_subtitle": "Compre vales-presente e carregue cartões de débito sem KYC",
+  "cake_pay_title": "Cartões de presente de pagamento de bolo",
+  "cake_pay_subtitle": "Compre vales-presente e resgate instantaneamente",
   "about_cake_pay": "O CakePay permite que você compre facilmente cartões-presente e carregue cartões de débito pré-pagos com criptomoedas, que podem ser gastos em milhões de comerciantes nos Estados Unidos.",
   "cake_pay_account_note": "Faça uma conta para ver os cartões disponíveis. Alguns estão até com desconto!",
   "already_have_account": "Já tem uma conta?",
diff --git a/res/values/strings_ru.arb b/res/values/strings_ru.arb
index cb0586bfa..7a3dba9ca 100644
--- a/res/values/strings_ru.arb
+++ b/res/values/strings_ru.arb
@@ -531,9 +531,9 @@
   "search": "Поиск",
   "new_template" : "Новый шаблон",
   "electrum_address_disclaimer": "Мы генерируем новые адреса каждый раз, когда вы их используете, но предыдущие адреса продолжают работать.",
-   "market_place": "Рыночная площадь",
-  "cake_pay_title": "Подарочные и дебетовые карты",
-  "cake_pay_subtitle": "Покупайте подарочные карты и пополняйте дебетовые карты без KYC",
+  "market_place": "Торговая площадка",
+  "cake_pay_title": "Подарочные карты Cake Pay",
+  "cake_pay_subtitle": "Купите подарочные карты и моментально погасите их",
   "about_cake_pay": "CakePay позволяет вам легко покупать подарочные карты и пополнять предоплаченные дебетовые карты криптовалютой, которую можно потратить в миллионах магазинов в США.",
   "cake_pay_account_note": "Создайте учетную запись, чтобы увидеть доступные карты. Некоторые даже доступны со скидкой!",
   "already_have_account": "У вас уже есть аккаунт?",
diff --git a/res/values/strings_uk.arb b/res/values/strings_uk.arb
index 3723e02d2..f9e594f84 100644
--- a/res/values/strings_uk.arb
+++ b/res/values/strings_uk.arb
@@ -531,8 +531,8 @@
   "new_template" : "Новий шаблон",
   "electrum_address_disclaimer": "Ми створюємо нові адреси щоразу, коли ви використовуєте їх, але попередні адреси продовжують працювати",
   "market_place": "Ринок",
-  "cake_pay_title": "Подарункові та дебетові картки",
-  "cake_pay_subtitle": "Купуйте подарункові картки та поповнюйте дебетові картки без KYC",
+  "cake_pay_title": "Подарункові картки Cake Pay",
+  "cake_pay_subtitle": "Купуйте подарункові картки та використовуйте їх миттєво",
   "about_cake_pay": "CakePay дозволяє легко купувати подарункові картки та завантажувати передплачені дебетові картки криптовалютами, які можна витратити в мільйонах продавців у Сполучених Штатах.",
   "cake_pay_account_note": "Створіть обліковий запис, щоб побачити доступні картки. Деякі навіть доступні зі знижкою!",
   "already_have_account": "Вже є обліковий запис?",
@@ -583,7 +583,7 @@
   "optionally_order_card": "Необов'язково замовте фізичну картку.",
   "hide_details": "Приховати деталі",
   "show_details": "Показати деталі",
-  "do": "до ${value}",
+  "upto": "до ${value}",
   "discount": "Зекономте ${value}%",
   "gift_card_amount": "Сума подарункової картки",
   "bill_amount": "Сума рахунку",
diff --git a/res/values/strings_zh.arb b/res/values/strings_zh.arb
index 564a81b1a..38484570c 100644
--- a/res/values/strings_zh.arb
+++ b/res/values/strings_zh.arb
@@ -530,8 +530,8 @@
   "new_template" : "新模板",
   "electrum_address_disclaimer": "每次您使用一个地址时，我们都会生成新地址，但之前的地址仍然有效",
   "market_place": "市场",
-  "cake_pay_title": "礼品卡和借记卡",
-  "cake_pay_subtitle": "购买礼品卡并为非 KYC 借记卡充值",
+  "cake_pay_title": "Cake Pay 礼品卡",
+  "cake_pay_subtitle": "购买礼品卡并立即兑换",
   "about_cake_pay": "CakePay 让您可以轻松购买礼品卡并使用加密货币加载预付借记卡，可在美国数百万商家消费。",
   "cake_pay_account_note": "注册一个账户来查看可用的卡片。有些甚至可以打折！",
   "already_have_account": "已经有账号了？",

From 4eedc723d256a6f79e61a3af6ac2930bde645e4a Mon Sep 17 00:00:00 2001
From: mkyq <53115730+mkyq@users.noreply.github.com>
Date: Wed, 20 Jul 2022 12:59:14 +0100
Subject: [PATCH 2/4] UI fixes for ionia. (#421)

---
 .../cards/ionia_buy_card_detail_page.dart     | 49 ++++++++++++---
 .../ionia/cards/ionia_buy_gift_card.dart      |  6 +-
 .../cards/ionia_gift_card_detail_page.dart    | 60 +++++++++----------
 3 files changed, 71 insertions(+), 44 deletions(-)

diff --git a/lib/src/screens/ionia/cards/ionia_buy_card_detail_page.dart b/lib/src/screens/ionia/cards/ionia_buy_card_detail_page.dart
index abf9b3032..793b24446 100644
--- a/lib/src/screens/ionia/cards/ionia_buy_card_detail_page.dart
+++ b/lib/src/screens/ionia/cards/ionia_buy_card_detail_page.dart
@@ -15,6 +15,7 @@ import 'package:cake_wallet/src/widgets/primary_button.dart';
 import 'package:cake_wallet/src/widgets/scollable_with_bottom_section.dart';
 import 'package:cake_wallet/src/widgets/standart_list_row.dart';
 import 'package:cake_wallet/store/settings_store.dart';
+import 'package:cake_wallet/themes/dark_theme.dart';
 import 'package:cake_wallet/themes/theme_base.dart';
 import 'package:cake_wallet/typography.dart';
 import 'package:cake_wallet/utils/show_pop_up.dart';
@@ -334,8 +335,8 @@ class IoniaBuyGiftCardDetailPage extends StatelessWidget {
                         PrimaryButton(
                           onPressed: () => Navigator.pop(context),
                           text: S.of(context).send_got_it,
-                          color: Color.fromRGBO(233, 242, 252, 1),
-                          textColor: Theme.of(context).textTheme.display2.color,
+                          color: Theme.of(context).accentTextTheme.caption.color,
+                          textColor: Theme.of(context).primaryTextTheme.title.color,
                         ),
                         SizedBox(height: 21),
                       ],
@@ -569,6 +570,40 @@ class TipButton extends StatelessWidget {
   final bool isSelected;
   final void Function() onTap;
 
+  bool isDark(BuildContext context) => Theme.of(context).brightness == Brightness.dark;
+
+  Color captionTextColor(BuildContext context) {
+    if (isDark(context)) {
+      return Theme.of(context).primaryTextTheme.title.color;
+    }
+
+    return isSelected
+      ? Theme.of(context).accentTextTheme.title.color
+      : Theme.of(context).primaryTextTheme.title.color;
+  }
+
+  Color subTitleTextColor(BuildContext context) {
+    if (isDark(context)) {
+      return Theme.of(context).primaryTextTheme.title.color;
+    }
+
+    return isSelected
+      ? Theme.of(context).accentTextTheme.title.color
+      : Theme.of(context).primaryTextTheme.overline.color;
+  }
+
+  Color backgroundColor(BuildContext context) {
+    if (isDark(context)) {
+      return isSelected
+        ? null
+        : Theme.of(context).accentTextTheme.display4.backgroundColor.withOpacity(0.01);
+    }
+
+    return isSelected
+        ? null
+        : Theme.of(context).accentTextTheme.display4.backgroundColor.withOpacity(0.1);
+  }
+
   @override
   Widget build(BuildContext context) {
     return InkWell(
@@ -580,17 +615,13 @@ class TipButton extends StatelessWidget {
           children: [
             Text(caption,
                 style: textSmallSemiBold(
-                    color: isSelected
-                        ? Theme.of(context).accentTextTheme.title.color
-                        : Theme.of(context).primaryTextTheme.title.color)),
+                    color: captionTextColor(context))),
             if (subTitle != null) ...[
               SizedBox(height: 4),
               Text(
                 subTitle,
                 style: textXxSmallSemiBold(
-                  color: isSelected
-                      ? Theme.of(context).accentTextTheme.title.color
-                      : Theme.of(context).primaryTextTheme.overline.color,
+                  color: subTitleTextColor(context),
                 ),
               ),
             ]
@@ -599,7 +630,7 @@ class TipButton extends StatelessWidget {
         padding: EdgeInsets.symmetric(horizontal: 18, vertical: 8),
         decoration: BoxDecoration(
           borderRadius: BorderRadius.circular(10),
-          color: Color.fromRGBO(242, 240, 250, 1),
+          color: backgroundColor(context),
           gradient: isSelected
               ? LinearGradient(
                   colors: [
diff --git a/lib/src/screens/ionia/cards/ionia_buy_gift_card.dart b/lib/src/screens/ionia/cards/ionia_buy_gift_card.dart
index 882dfdc88..e84682559 100644
--- a/lib/src/screens/ionia/cards/ionia_buy_gift_card.dart
+++ b/lib/src/screens/ionia/cards/ionia_buy_gift_card.dart
@@ -124,13 +124,13 @@ class IoniaBuyGiftCardPage extends BasePage {
                       crossAxisAlignment: CrossAxisAlignment.start,
                       children: [
                         Text(
-                          S.of(context).min_amount(merchant.minimumCardPurchase.toString()),
+                          S.of(context).min_amount(merchant.minimumCardPurchase.toStringAsFixed(2)),
                           style: TextStyle(
                             color: Theme.of(context).primaryTextTheme.headline.color,
                           ),
                         ),
                         Text(
-                          S.of(context).max_amount(merchant.maximumCardPurchase.toString()),
+                          S.of(context).max_amount(merchant.maximumCardPurchase.toStringAsFixed(2)),
                           style: TextStyle(
                             color: Theme.of(context).primaryTextTheme.headline.color,
                           ),
@@ -171,7 +171,7 @@ class IoniaBuyGiftCardPage extends BasePage {
                     text: S.of(context).continue_text,
                     isDisabled: !ioniaBuyCardViewModel.isEnablePurchase,
                     color: Theme.of(context).accentTextTheme.body2.color,
-                    textColor: Theme.of(context).accentTextTheme.headline.decorationColor,
+                    textColor: Colors.white,
                   ),
                 );
               }),
diff --git a/lib/src/screens/ionia/cards/ionia_gift_card_detail_page.dart b/lib/src/screens/ionia/cards/ionia_gift_card_detail_page.dart
index eeead6d55..b1347a1b1 100644
--- a/lib/src/screens/ionia/cards/ionia_gift_card_detail_page.dart
+++ b/lib/src/screens/ionia/cards/ionia_gift_card_detail_page.dart
@@ -107,7 +107,7 @@ class IoniaGiftCardDetailPage extends BasePage {
             buildIoniaTile(
               context,
               title: S.of(context).amount,
-              subTitle: viewModel.giftCard.remainingAmount.toString() ?? '0',
+              subTitle: viewModel.giftCard.remainingAmount.toStringAsFixed(2) ?? '0.00',
             )),
           Divider(height: 50),
           TextIconButton(
@@ -174,41 +174,37 @@ class IoniaGiftCardDetailPage extends BasePage {
                           ),
                         ),
                         Align(
-                          alignment: Alignment.bottomLeft,
-                          child: Container(
-                            constraints: BoxConstraints(
-                              maxHeight: MediaQuery.of(context).size.height * 0.5),
-                            child:  Expanded(
-                            child: ListView.builder(
-                              itemCount: viewModel.giftCard.usageInstructions.length,
-                              itemBuilder: (_, int index) {
-                                  final instruction = viewModel.giftCard.usageInstructions[index];
-                                  return Expanded(
-                                    child: Column(
-                                      children: [
-                                        Padding(
-                                          padding: EdgeInsets.all(10),
-                                          child: Text(
-                                          instruction.header,
-                                          style: textLargeSemiBold(
-                                            color: Theme.of(context).textTheme.display2.color,
-                                          ),
-                                        )),
-                                        Text(
-                                          instruction.body,
-                                          style: textMedium(
-                                            color: Theme.of(context).textTheme.display2.color,
-                                          ),
-                                        )
-                                      ]));
-                                })))
-                        ),
+                            alignment: Alignment.bottomLeft,
+                            child: Container(
+                              constraints: BoxConstraints(
+                                maxHeight: MediaQuery.of(context).size.height * 0.5),
+                                child: SingleChildScrollView(
+                                    child: Column(children: viewModel.giftCard.usageInstructions.map((instruction) {
+                                      return [
+                                         Padding(
+                                            padding: EdgeInsets.all(10),
+                                            child: Text(
+                                            instruction.header,
+                                            style: textLargeSemiBold(
+                                              color: Theme.of(context).textTheme.display2.color,
+                                            ),
+                                          )),
+                                          Text(
+                                            instruction.body,
+                                            style: textMedium(
+                                              color: Theme.of(context).textTheme.display2.color,
+                                            ),
+                                          )
+                                      ];
+                                    }).expand((e) => e).toList())
+                              )
+                          )),
                         SizedBox(height: 35),
                         PrimaryButton(
                           onPressed: () => Navigator.pop(context),
                           text: S.of(context).send_got_it,
-                          color: Color.fromRGBO(233, 242, 252, 1),
-                          textColor: Theme.of(context).textTheme.display2.color,
+                          color: Theme.of(context).accentTextTheme.caption.color,
+                          textColor: Theme.of(context).primaryTextTheme.title.color,
                         ),
                         SizedBox(height: 21),
                       ],

From c1fbd744b7159f42b30ccffe8716792933b35de8 Mon Sep 17 00:00:00 2001
From: Godwin Asuquo <41484542+godilite@users.noreply.github.com>
Date: Wed, 20 Jul 2022 15:03:37 +0300
Subject: [PATCH 3/4] CW-129 ionia welcome screen text changes (#418)

* update welcome text

* Update localization
---
 res/values/strings_de.arb | 4 ++--
 res/values/strings_en.arb | 4 ++--
 res/values/strings_es.arb | 4 ++--
 res/values/strings_fr.arb | 4 ++--
 res/values/strings_hi.arb | 2 +-
 res/values/strings_hr.arb | 4 ++--
 res/values/strings_it.arb | 4 ++--
 res/values/strings_ja.arb | 4 ++--
 res/values/strings_ko.arb | 4 ++--
 res/values/strings_nl.arb | 4 ++--
 res/values/strings_pl.arb | 4 ++--
 res/values/strings_pt.arb | 4 ++--
 res/values/strings_ru.arb | 4 ++--
 res/values/strings_uk.arb | 4 ++--
 res/values/strings_zh.arb | 4 ++--
 15 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/res/values/strings_de.arb b/res/values/strings_de.arb
index cbf45b161..27b76e115 100644
--- a/res/values/strings_de.arb
+++ b/res/values/strings_de.arb
@@ -534,12 +534,12 @@
   "market_place": "Marktplatz",
   "cake_pay_title": "Cake Pay-Geschenkkarten",
   "cake_pay_subtitle": "Geschenkkarten kaufen und sofort einlösen",
-  "about_cake_pay": "CakePay macht es einfach, Geschenkkarten zu kaufen und Prepaid-Debitkarten mit Kryptowährungen aufzuladen, die bei Millionen von Händlern in den Vereinigten Staaten ausgegeben werden können.",
+  "about_cake_pay": "Mit Cake Pay können Sie ganz einfach Geschenkkarten mit virtuellen Vermögenswerten kaufen, die Sie sofort bei über 150.000 Händlern in den Vereinigten Staaten ausgeben können.",
   "cake_pay_account_note": "Erstellen Sie ein Konto, um die verfügbaren Karten zu sehen. Einige sind sogar mit Rabatt erhältlich!",
   "already_have_account": "Sie haben bereits ein Konto?",
   "create_account": "Konto erstellen",
   "privacy_policy": "Datenschutzrichtlinie",
-  "welcome_to_cakepay": "Willkommen bei CakePay!",
+  "welcome_to_cakepay": "Willkommen bei Cake Pay!",
   "sign_up": "Anmelden",
   "forgot_password": "Passwort vergessen",
   "reset_password": "Passwort zurücksetzen",
diff --git a/res/values/strings_en.arb b/res/values/strings_en.arb
index f49446d04..1d71d4a5a 100644
--- a/res/values/strings_en.arb
+++ b/res/values/strings_en.arb
@@ -534,12 +534,12 @@
   "market_place": "Marketplace",
   "cake_pay_title": "Cake Pay Gift Cards",
   "cake_pay_subtitle": "Buy gift cards and redeem instantly",
-  "about_cake_pay": "CakePay allows you to easily buy gift cards and load up prepaid debit cards with cryptocurrencies, spendable at millions of merchants in the United States.",
+  "about_cake_pay": "Cake Pay allows you to easily buy gift cards with virtual assets, spendable instantly at over 150,000 merchants in the United States.",
   "cake_pay_account_note": "Make an account to see the available cards. Some are even available at a discount!",
   "already_have_account": "Already have an account?",
   "create_account": "Create Account",
   "privacy_policy": "Privacy policy",
-  "welcome_to_cakepay": "Welcome to CakePay!",
+  "welcome_to_cakepay": "Welcome to Cake Pay!",
   "sign_up": "Sign Up",
   "forgot_password": "Forgot Password",
   "reset_password": "Reset Password",
diff --git a/res/values/strings_es.arb b/res/values/strings_es.arb
index 88b328e9b..935c4c83a 100644
--- a/res/values/strings_es.arb
+++ b/res/values/strings_es.arb
@@ -534,12 +534,12 @@
   "market_place": "Mercado",
   "cake_pay_title": "Tarjetas de regalo Cake Pay",
   "cake_pay_subtitle": "Compra tarjetas de regalo y canjéalas al instante",
-  "about_cake_pay": "CakePay te permite comprar fácilmente tarjetas de regalo y cargar tarjetas de débito prepagas con criptomonedas, gastables en millones de comerciantes en los Estados Unidos.",
+  "about_cake_pay": "Cake Pay le permite comprar fácilmente tarjetas de regalo con activos virtuales, gastables instantáneamente en más de 150 000 comerciantes en los Estados Unidos.",
   "cake_pay_account_note": "Crea una cuenta para ver las tarjetas disponibles. ¡Algunas incluso están disponibles con descuento!",
   "already_have_account": "¿Ya tienes una cuenta?",
   "create_account": "Crear Cuenta",
   "privacy_policy": "Política de privacidad",
-  "welcome_to_cakepay": "¡Bienvenido a CakePay!",
+  "welcome_to_cakepay": "¡Bienvenido a Cake Pay!",
   "sign_up": "Registrarse",
   "forgot_password": "Olvidé mi contraseña",
   "reset_password": "Restablecer contraseña",
diff --git a/res/values/strings_fr.arb b/res/values/strings_fr.arb
index fa4dd6bfc..dce0f0741 100644
--- a/res/values/strings_fr.arb
+++ b/res/values/strings_fr.arb
@@ -532,12 +532,12 @@
   "market_place": "Place de marché",
   "cake_pay_title": "Cartes cadeaux Cake Pay",
   "cake_pay_subtitle": "Achetez des cartes-cadeaux et échangez-les instantanément",
-  "about_cake_pay": "CakePay vous permet d'acheter facilement des cartes-cadeaux et de charger des cartes de débit prépayées avec des crypto-monnaies, utilisables chez des millions de marchands aux États-Unis.",
+  "about_cake_pay": "Cake Pay vous permet d'acheter facilement des cartes-cadeaux avec des actifs virtuels, utilisables instantanément chez plus de 150 000 marchands aux États-Unis.",
   "cake_pay_account_note": "Créez un compte pour voir les cartes disponibles. Certaines sont même disponibles à prix réduit !",
   "already_have_account": "Vous avez déjà un compte ?",
   "create_account": "Créer un compte",
   "privacy_policy": "Politique de confidentialité",
-  "welcome_to_cakepay": "Bienvenue sur CakePay !",
+  "welcome_to_cakepay": "Bienvenue sur Cake Pay!",
   "sign_up": "S'inscrire",
   "forgot_password": "Mot de passe oublié",
   "reset_password": "Réinitialiser le mot de passe",
diff --git a/res/values/strings_hi.arb b/res/values/strings_hi.arb
index 78a7ec422..922e3e81f 100644
--- a/res/values/strings_hi.arb
+++ b/res/values/strings_hi.arb
@@ -534,7 +534,7 @@
   "market_place": "मार्केटप्लेस",
   "cake_pay_title": "केक पे गिफ्ट कार्ड्स",
   "cake_pay_subtitle": "उपहार कार्ड खरीदें और तुरंत रिडीम करें",
-  "about_cake_pay": "केकपे आपको आसानी से उपहार कार्ड खरीदने और क्रिप्टोकरंसी के साथ प्रीपेड डेबिट कार्ड लोड करने की अनुमति देता है, जो संयुक्त राज्य में लाखों व्यापारियों पर खर्च करने योग्य है।",
+  "about_cake_pay": "केक पे आपको वर्चुअल संपत्ति के साथ आसानी से उपहार कार्ड खरीदने की अनुमति देता है, जिसे संयुक्त राज्य में 150,000 से अधिक व्यापारियों पर तुरंत खर्च किया जा सकता है।",
   "cake_pay_account_note": "उपलब्ध कार्ड देखने के लिए एक खाता बनाएं। कुछ छूट पर भी उपलब्ध हैं!",
   "ready_have_account": "क्या आपके पास पहले से ही एक खाता है?",
   "create_account": "खाता बनाएं",
diff --git a/res/values/strings_hr.arb b/res/values/strings_hr.arb
index 2187b889d..cbdb1a8ad 100644
--- a/res/values/strings_hr.arb
+++ b/res/values/strings_hr.arb
@@ -534,12 +534,12 @@
   "market_place": "Tržnica",
   "cake_pay_title": "Cake Pay poklon kartice",
   "cake_pay_subtitle": "Kupite darovne kartice i odmah ih iskoristite",
-  "about_cake_pay": "CakePay vam omogućuje jednostavnu kupnju darovnih kartica i punjenje unaprijed plaćenih debitnih kartica kriptovalutama koje možete potrošiti kod milijuna trgovaca u Sjedinjenim Državama.",
+  "about_cake_pay": "Cake Pay vam omogućuje jednostavnu kupnju darovnih kartica s virtualnim sredstvima, koja se trenutno mogu potrošiti kod više od 150 000 trgovaca u Sjedinjenim Državama.",
   "cake_pay_account_note": "Napravite račun da vidite dostupne kartice. Neke su čak dostupne uz popust!",
   "already_have_account": "Već imate račun?",
   "create_account": "Stvori račun",
   "privacy_policy": "Pravila privatnosti",
-  "welcome_to_cakepay": "Dobro došli u CakePay!",
+  "welcome_to_cakepay": "Dobro došli u Cake Pay!",
   "sign_up": "Prijavite se",
   "forgot_password": "Zaboravljena lozinka",
   "reset_password": "Poništi lozinku",
diff --git a/res/values/strings_it.arb b/res/values/strings_it.arb
index b85f79766..bfb99ce18 100644
--- a/res/values/strings_it.arb
+++ b/res/values/strings_it.arb
@@ -534,12 +534,12 @@
   "market_place": "Mercato",
   "cake_pay_title": "Carte regalo Cake Pay",
   "cake_pay_subtitle": "Acquista carte regalo e riscattale all'istante",
-  "about_cake_pay": "CakePay ti consente di acquistare facilmente buoni regalo e caricare carte di debito prepagate con criptovalute, spendibili presso milioni di commercianti negli Stati Uniti.",
+  "about_cake_pay": "Cake Pay ti consente di acquistare facilmente buoni regalo con asset virtuali, spendibili istantaneamente presso oltre 150.000 commercianti negli Stati Uniti.",
   "cake_pay_account_note": "Crea un account per vedere le carte disponibili. Alcune sono anche disponibili con uno sconto!",
   "already_have_account": "Hai già un account?",
   "create_account": "Crea account",
   "privacy_policy": "Informativa sulla privacy",
-  "welcome_to_cakepay": "Benvenuto in CakePay!",
+  "welcome_to_cakepay": "Benvenuto in Cake Pay!",
   "sign_up": "Registrati",
   "forgot_password": "Password dimenticata",
   "reset_password": "Reimposta password",
diff --git a/res/values/strings_ja.arb b/res/values/strings_ja.arb
index 882ed330c..b9cef6505 100644
--- a/res/values/strings_ja.arb
+++ b/res/values/strings_ja.arb
@@ -534,12 +534,12 @@
   "market_place": "Marketplace",
   "cake_pay_title": "ケーキペイギフトカード",
   "cake_pay_subtitle": "ギフトカードを購入してすぐに利用できます",
-  "about_cake_pay": "CakePayを使用すると、ギフトカードを簡単に購入し、米国内の数百万の加盟店で使用できる暗号通貨を使用してプリペイドデビットカードをロードできます。",
+  "about_cake_pay": "Cake Payを使用すると、仮想資産を含むギフトカードを簡単に購入でき、米国内の150,000を超える加盟店ですぐに利用できます。",
   "cake_pay_account_note": "アカウントを作成して、利用可能なカードを確認してください。割引価格で利用できるカードもあります！",
   "already_have_account": "すでにアカウントをお持ちですか？",
   "create_account": "アカウントの作成",
   "privacy_policy": "プライバシーポリシー",
-  "welcome_to_cakepay": "CakePayへようこそ！",
+  "welcome_to_cakepay": "Cake Payへようこそ！",
   "sign_up": "サインアップ",
   "forgot_password": "パスワードを忘れた",
   "reset_password": "パスワードのリセット",
diff --git a/res/values/strings_ko.arb b/res/values/strings_ko.arb
index 39a092b12..623f10fc5 100644
--- a/res/values/strings_ko.arb
+++ b/res/values/strings_ko.arb
@@ -534,12 +534,12 @@
   "market_place": "마켓플레이스",
   "cake_pay_title": "케이크 페이 기프트 카드",
   "cake_pay_subtitle": "기프트 카드를 구매하고 즉시 사용",
-  "about_cake_pay": "CakePay를 사용하면 기프트 카드를 쉽게 구매하고 미국의 수백만 판매자에서 사용할 수 있는 암호화폐가 포함된 선불 직불 카드를 충전할 수 있습니다.",
+  "about_cake_pay": "Cake Pay를 사용하면 미국 내 150,000개 이상의 가맹점에서 즉시 사용할 수 있는 가상 자산이 포함된 기프트 카드를 쉽게 구입할 수 있습니다.",
   "cake_pay_account_note": "사용 가능한 카드를 보려면 계정을 만드십시오. 일부는 할인된 가격으로 사용 가능합니다!",
   "already_have_account": "이미 계정이 있습니까?",
   "create_account": "계정 만들기",
   "privacy_policy": "개인 정보 보호 정책",
-  "welcome_to_cakepay": "CakePay에 오신 것을 환영합니다!",
+  "welcome_to_cakepay": "Cake Pay에 오신 것을 환영합니다!",
   "sign_up": "가입",
   "forgot_password": "비밀번호 찾기",
   "reset_password": "비밀번호 재설정",
diff --git a/res/values/strings_nl.arb b/res/values/strings_nl.arb
index f4d879120..4a56da196 100644
--- a/res/values/strings_nl.arb
+++ b/res/values/strings_nl.arb
@@ -534,12 +534,12 @@
   "market_place": "Marktplaats",
   "cake_pay_title": "Cake Pay-cadeaubonnen",
   "cake_pay_subtitle": "Koop cadeaubonnen en wissel ze direct in",
-  "about_cake_pay": "Met CakePay kun je gemakkelijk cadeaubonnen kopen en prepaid-betaalkaarten opladen met cryptocurrencies, te besteden bij miljoenen verkopers in de Verenigde Staten.",
+  "about_cake_pay": "Met Cake Pay kunt u eenvoudig cadeaubonnen kopen met virtuele activa, die direct kunnen worden uitgegeven bij meer dan 150.000 handelaren in de Verenigde Staten.",
   "cake_pay_account_note": "Maak een account aan om de beschikbare kaarten te zien. Sommige zijn zelfs met korting verkrijgbaar!",
   "already_have_account": "Heb je al een account?",
   "create_account": "Account aanmaken",
   "privacy_policy": "Privacybeleid",
-  "welcome_to_cakepay": "Welkom bij CakePay!",
+  "welcome_to_cakepay": "Welkom bij Cake Pay!",
   "sign_up": "Aanmelden",
   "forgot_password": "Wachtwoord vergeten",
   "reset_password": "Wachtwoord resetten",
diff --git a/res/values/strings_pl.arb b/res/values/strings_pl.arb
index ea31bcef8..3754335c1 100644
--- a/res/values/strings_pl.arb
+++ b/res/values/strings_pl.arb
@@ -537,12 +537,12 @@
   "market_place": "Rynek",
   "cake_pay_title": "Karty podarunkowe Cake Pay",
   "cake_pay_subtitle": "Kup karty podarunkowe i wykorzystaj je natychmiast",
-  "about_cake_pay": "CakePay umożliwia łatwe kupowanie kart podarunkowych i doładowanie przedpłaconych kart debetowych kryptowalutami, które można wydać u milionów sprzedawców w Stanach Zjednoczonych.",
+  "about_cake_pay": "Cake Pay umożliwia łatwe kupowanie kart podarunkowych z wirtualnymi aktywami, które można natychmiast wydać u ponad 150 000 sprzedawców w Stanach Zjednoczonych.",
   "cake_pay_account_note": "Załóż konto, aby zobaczyć dostępne karty. Niektóre są nawet dostępne ze zniżką!",
   "already_have_account": "Masz już konto?",
   "create_account": "Utwórz konto",
   "privacy_policy": "Polityka prywatności",
-  "welcome_to_cakepay": "Witamy w CakePay!",
+  "welcome_to_cakepay": "Witamy w Cake Pay!",
   "sign_up": "Zarejestruj się",
   "forgot_password": "Zapomniałem hasła",
   "reset_password": "Zresetuj hasło",
diff --git a/res/values/strings_pt.arb b/res/values/strings_pt.arb
index 9dee3ca4b..bc9cdf74d 100644
--- a/res/values/strings_pt.arb
+++ b/res/values/strings_pt.arb
@@ -534,12 +534,12 @@
   "market_place": "Mercado",
   "cake_pay_title": "Cartões de presente de pagamento de bolo",
   "cake_pay_subtitle": "Compre vales-presente e resgate instantaneamente",
-  "about_cake_pay": "O CakePay permite que você compre facilmente cartões-presente e carregue cartões de débito pré-pagos com criptomoedas, que podem ser gastos em milhões de comerciantes nos Estados Unidos.",
+  "about_cake_pay": "O Cake Pay permite que você compre facilmente cartões-presente com ativos virtuais, que podem ser gastos instantaneamente em mais de 150.000 comerciantes nos Estados Unidos.",
   "cake_pay_account_note": "Faça uma conta para ver os cartões disponíveis. Alguns estão até com desconto!",
   "already_have_account": "Já tem uma conta?",
   "create_account": "Criar conta",
   "privacy_policy": "Política de privacidade",
-  "welcome_to_cakepay": "Bem-vindo ao CakePay!",
+  "welcome_to_cakepay": "Bem-vindo ao Cake Pay!",
   "create_account": "Registar-se",
   "forgot_password": "Esqueci a senha",
   "reset_password": "Redefinir senha",
diff --git a/res/values/strings_ru.arb b/res/values/strings_ru.arb
index 7a3dba9ca..752e21eeb 100644
--- a/res/values/strings_ru.arb
+++ b/res/values/strings_ru.arb
@@ -534,12 +534,12 @@
   "market_place": "Торговая площадка",
   "cake_pay_title": "Подарочные карты Cake Pay",
   "cake_pay_subtitle": "Купите подарочные карты и моментально погасите их",
-  "about_cake_pay": "CakePay позволяет вам легко покупать подарочные карты и пополнять предоплаченные дебетовые карты криптовалютой, которую можно потратить в миллионах магазинов в США.",
+  "about_cake_pay": "Cake Pay позволяет вам легко покупать подарочные карты с виртуальными активами, которые можно мгновенно потратить в более чем 150 000 продавцов в Соединенных Штатах.",
   "cake_pay_account_note": "Создайте учетную запись, чтобы увидеть доступные карты. Некоторые даже доступны со скидкой!",
   "already_have_account": "У вас уже есть аккаунт?",
   "create_account": "Создать аккаунт",
   "privacy_policy": "Политика конфиденциальности",
-  "welcome_to_cakepay": "Добро пожаловать в CakePay!",
+  "welcome_to_cakepay": "Добро пожаловать в Cake Pay!",
   "sign_up": "Зарегистрироваться",
   "forgot_password": "Забыли пароль",
   "reset_password": "Сбросить пароль",
diff --git a/res/values/strings_uk.arb b/res/values/strings_uk.arb
index f9e594f84..84b9e6b26 100644
--- a/res/values/strings_uk.arb
+++ b/res/values/strings_uk.arb
@@ -533,12 +533,12 @@
   "market_place": "Ринок",
   "cake_pay_title": "Подарункові картки Cake Pay",
   "cake_pay_subtitle": "Купуйте подарункові картки та використовуйте їх миттєво",
-  "about_cake_pay": "CakePay дозволяє легко купувати подарункові картки та завантажувати передплачені дебетові картки криптовалютами, які можна витратити в мільйонах продавців у Сполучених Штатах.",
+  "about_cake_pay": "Cake Pay дозволяє вам легко купувати подарункові картки з віртуальними активами, які можна миттєво витратити в понад 150 000 продавців у Сполучених Штатах.",
   "cake_pay_account_note": "Створіть обліковий запис, щоб побачити доступні картки. Деякі навіть доступні зі знижкою!",
   "already_have_account": "Вже є обліковий запис?",
   "create_account": "Створити обліковий запис",
   "privacy_policy": "Політика конфіденційності",
-  "welcome_to_cakepay": "Ласкаво просимо до CakePay!",
+  "welcome_to_cakepay": "Ласкаво просимо до Cake Pay!",
   "sign_up": "Зареєструватися",
   "forgot_password": "Забули пароль",
   "reset_password": "Скинути пароль",
diff --git a/res/values/strings_zh.arb b/res/values/strings_zh.arb
index 38484570c..e673b9896 100644
--- a/res/values/strings_zh.arb
+++ b/res/values/strings_zh.arb
@@ -532,12 +532,12 @@
   "market_place": "市场",
   "cake_pay_title": "Cake Pay 礼品卡",
   "cake_pay_subtitle": "购买礼品卡并立即兑换",
-  "about_cake_pay": "CakePay 让您可以轻松购买礼品卡并使用加密货币加载预付借记卡，可在美国数百万商家消费。",
+  "about_cake_pay": "Cake Pay 让您可以轻松购买带有虚拟资产的礼品卡，可立即在美国超过 150,000 家商家消费。",
   "cake_pay_account_note": "注册一个账户来查看可用的卡片。有些甚至可以打折！",
   "already_have_account": "已经有账号了？",
   "create_account": "创建账户",
   "privacy_policy": "隐私政策",
-  "welcome_to_cakepay": "欢迎来到 CakePay！",
+  "welcome_to_cakepay": "欢迎来到 Cake Pay！",
   "sign_up": "注册",
   "forgot_password": "忘记密码",
   "reset_password": "重置密码",

From 8b4fa5a12d4ba97563cdfbd738a5eb506274ea4f Mon Sep 17 00:00:00 2001
From: mkyq <53115730+mkyq@users.noreply.github.com>
Date: Wed, 20 Jul 2022 13:28:22 +0100
Subject: [PATCH 4/4] Cw 133 (#422)

* UI fixes for ionia.

* Fixes for display card item on gift cards screen.
---
 lib/src/screens/ionia/widgets/card_item.dart | 21 +++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/lib/src/screens/ionia/widgets/card_item.dart b/lib/src/screens/ionia/widgets/card_item.dart
index bcddccdb9..ae3554331 100644
--- a/lib/src/screens/ionia/widgets/card_item.dart
+++ b/lib/src/screens/ionia/widgets/card_item.dart
@@ -62,7 +62,9 @@ class CardItem extends StatelessWidget {
                   SizedBox(width: 5),
                 ],
                 Column(
-                  crossAxisAlignment: CrossAxisAlignment.start,
+                  crossAxisAlignment: (subTitle?.isEmpty ?? false)
+                    ? CrossAxisAlignment.center
+                    : CrossAxisAlignment.start,
                   children: [
                     SizedBox(
                       width: 200,
@@ -76,14 +78,15 @@ class CardItem extends StatelessWidget {
                         ),
                       ),
                     ),
-                    SizedBox(height: 5),
-                    Text(
-                      subTitle,
-                      style: TextStyle(
-                        color: subtitleColor,
-                        fontWeight: FontWeight.w500,
-                        fontFamily: 'Lato',
-                      ),
+                    if (subTitle?.isNotEmpty ?? false)
+                      Padding(
+                        padding: EdgeInsets.only(top: 5),
+                        child: Text(
+                          subTitle,
+                          style: TextStyle(
+                            color: subtitleColor,
+                            fontWeight: FontWeight.w500,
+                            fontFamily: 'Lato')),
                     )
                   ],
                 ),