From 9f5438d2f4cf3addac49ef164632337c4e261049 Mon Sep 17 00:00:00 2001
From: Serhii <borodenko.sv@gmail.com>
Date: Wed, 25 Jan 2023 12:28:44 +0200
Subject: [PATCH 1/4] update localization files

---
 res/values/strings_ar.arb | 3 ++-
 res/values/strings_de.arb | 3 ++-
 res/values/strings_en.arb | 3 ++-
 res/values/strings_es.arb | 3 ++-
 res/values/strings_fr.arb | 3 ++-
 res/values/strings_hi.arb | 3 ++-
 res/values/strings_hr.arb | 3 ++-
 res/values/strings_it.arb | 3 ++-
 res/values/strings_ja.arb | 3 ++-
 res/values/strings_ko.arb | 3 ++-
 res/values/strings_my.arb | 3 ++-
 res/values/strings_nl.arb | 3 ++-
 res/values/strings_pl.arb | 3 ++-
 res/values/strings_pt.arb | 3 ++-
 res/values/strings_ru.arb | 3 ++-
 res/values/strings_th.arb | 3 ++-
 res/values/strings_tr.arb | 3 ++-
 res/values/strings_uk.arb | 3 ++-
 res/values/strings_zh.arb | 3 ++-
 19 files changed, 38 insertions(+), 19 deletions(-)

diff --git a/res/values/strings_ar.arb b/res/values/strings_ar.arb
index 250f29a70..25ec6465a 100644
--- a/res/values/strings_ar.arb
+++ b/res/values/strings_ar.arb
@@ -678,5 +678,6 @@
    "enabled":"ممكنة",
    "tor_only":"Tor فقط",
    "unmatched_currencies": "عملة محفظتك الحالية لا تتطابق مع عملة QR الممسوحة ضوئيًا",
-   "orbot_running_alert": "يرجى التأكد من تشغيل Orbot قبل الاتصال بهذه العقدة."
+   "orbot_running_alert": "يرجى التأكد من تشغيل Orbot قبل الاتصال بهذه العقدة.",
+   "bitcoin_payments_require_1_confirmation": "تتطلب مدفوعات Bitcoin تأكيدًا واحدًا ، والذي قد يستغرق 20 دقيقة أو أكثر. شكرا لصبرك! سيتم إرسال بريد إلكتروني إليك عند تأكيد الدفع."
 }
diff --git a/res/values/strings_de.arb b/res/values/strings_de.arb
index 2e71e8ce9..760c15ff4 100644
--- a/res/values/strings_de.arb
+++ b/res/values/strings_de.arb
@@ -680,5 +680,6 @@
   "unmatched_currencies": "Die Währung Ihres aktuellen Wallets stimmt nicht mit der des gescannten QR überein",
   "orbot_running_alert": "Bitte stellen Sie sicher, dass Orbot läuft, bevor Sie sich mit diesem Knoten verbinden.",
   "contact_list_contacts": "Kontakte",
-  "contact_list_wallets": "Meine Geldbörsen"
+  "contact_list_wallets": "Meine Geldbörsen",
+  "bitcoin_payments_require_1_confirmation": "Bitcoin-Zahlungen erfordern 1 Bestätigung, was 20 Minuten oder länger dauern kann. Danke für Ihre Geduld! Sie erhalten eine E-Mail, wenn die Zahlung bestätigt ist."
 }
diff --git a/res/values/strings_en.arb b/res/values/strings_en.arb
index a2b1cc702..cafbb37e8 100644
--- a/res/values/strings_en.arb
+++ b/res/values/strings_en.arb
@@ -680,5 +680,6 @@
   "unmatched_currencies": "Your current wallet's currency does not match that of the scanned QR",
   "orbot_running_alert": "Please make sure Orbot is running prior to connecting to this node.",
   "contact_list_contacts": "Contacts",
-  "contact_list_wallets": "My Wallets"
+  "contact_list_wallets": "My Wallets",
+  "bitcoin_payments_require_1_confirmation": "Bitcoin payments require 1 confirmation, which can take 20 minutes or longer. Thanks for your patience! You will be emailed when the payment is confirmed."
 }
diff --git a/res/values/strings_es.arb b/res/values/strings_es.arb
index 6cbfa627a..a8a890c01 100644
--- a/res/values/strings_es.arb
+++ b/res/values/strings_es.arb
@@ -680,5 +680,6 @@
   "unmatched_currencies": "La moneda de su billetera actual no coincide con la del QR escaneado",
   "orbot_running_alert": "Asegúrese de que Orbot se esté ejecutando antes de conectarse a este nodo.",
   "contact_list_contacts": "Contactos",
-  "contact_list_wallets": "Mis billeteras"
+  "contact_list_wallets": "Mis billeteras",
+  "bitcoin_payments_require_1_confirmation": "Los pagos de Bitcoin requieren 1 confirmación, que puede demorar 20 minutos o más. ¡Gracias por su paciencia! Se le enviará un correo electrónico cuando se confirme el pago."
 }
diff --git a/res/values/strings_fr.arb b/res/values/strings_fr.arb
index 185466813..297f62eb5 100644
--- a/res/values/strings_fr.arb
+++ b/res/values/strings_fr.arb
@@ -678,5 +678,6 @@
   "orbot_running_alert": "Veuillez vous assurer qu'Orbot est en cours d'exécution avant de vous connecter à ce nœud.",
   "unmatched_currencies": "La devise de votre portefeuille (wallet) actuel ne correspond pas à celle du QR code scanné",
   "contact_list_contacts": "Contacts",
-  "contact_list_wallets": "Mes portefeuilles (wallets)"
+  "contact_list_wallets": "Mes portefeuilles (wallets)",
+  "bitcoin_payments_require_1_confirmation": "Les paiements Bitcoin nécessitent 1 confirmation, ce qui peut prendre 20 minutes ou plus. Merci pour votre patience! Vous serez averti par e-mail lorsque le paiement sera confirmé."
 }
diff --git a/res/values/strings_hi.arb b/res/values/strings_hi.arb
index e906b3cc4..773a108f0 100644
--- a/res/values/strings_hi.arb
+++ b/res/values/strings_hi.arb
@@ -680,5 +680,6 @@
   "orbot_running_alert": "कृपया सुनिश्चित करें कि इस नोड से कनेक्ट करने से पहले Orbot चल रहा है।",
   "unmatched_currencies": "आपके वर्तमान वॉलेट की मुद्रा स्कैन किए गए क्यूआर से मेल नहीं खाती" ,
   "contact_list_contacts": "संपर्क",
-  "contact_list_wallets": "मेरा बटुआ"
+  "contact_list_wallets": "मेरा बटुआ",
+  "bitcoin_payments_require_1_confirmation": "बिटकॉइन भुगतान के लिए 1 पुष्टिकरण की आवश्यकता होती है, जिसमें 20 मिनट या अधिक समय लग सकता है। आपके धैर्य के लिए धन्यवाद! भुगतान की पुष्टि होने पर आपको ईमेल किया जाएगा।"
 }
diff --git a/res/values/strings_hr.arb b/res/values/strings_hr.arb
index b44d2d6c3..7712b50bf 100644
--- a/res/values/strings_hr.arb
+++ b/res/values/strings_hr.arb
@@ -680,5 +680,6 @@
   "unmatched_currencies": "Valuta vašeg trenutnog novčanika ne odgovara onoj na skeniranom QR-u",
   "orbot_running_alert": "Provjerite radi li Orbot prije spajanja na ovaj čvor.",
   "contact_list_contacts": "Kontakti",
-  "contact_list_wallets": "Moji novčanici"
+  "contact_list_wallets": "Moji novčanici",
+  "bitcoin_payments_require_1_confirmation": "Bitcoin plaćanja zahtijevaju 1 potvrdu, što može potrajati 20 minuta ili dulje. Hvala na Vašem strpljenju! Dobit ćete e-poruku kada plaćanje bude potvrđeno."
 }
diff --git a/res/values/strings_it.arb b/res/values/strings_it.arb
index 6885fefa8..a7c636998 100644
--- a/res/values/strings_it.arb
+++ b/res/values/strings_it.arb
@@ -680,5 +680,6 @@
   "unmatched_currencies": "La valuta del tuo portafoglio attuale non corrisponde a quella del QR scansionato",
   "orbot_running_alert": "Assicurati che Orbot sia in esecuzione prima di connetterti a questo nodo.",
   "contact_list_contacts": "Contatti",
-  "contact_list_wallets": "I miei portafogli"
+  "contact_list_wallets": "I miei portafogli",
+  "bitcoin_payments_require_1_confirmation": "I pagamenti in bitcoin richiedono 1 conferma, che può richiedere 20 minuti o più. Grazie per la vostra pazienza! Riceverai un'e-mail quando il pagamento sarà confermato."
 }
diff --git a/res/values/strings_ja.arb b/res/values/strings_ja.arb
index f02b76598..242163a6e 100644
--- a/res/values/strings_ja.arb
+++ b/res/values/strings_ja.arb
@@ -680,5 +680,6 @@
   "unmatched_currencies": "現在のウォレットの通貨がスキャンされたQRの通貨と一致しません",
   "orbot_running_alert": "このノードに接続する前に、Orbot が実行されていることを確認してください",
   "contact_list_contacts": "連絡先",
-  "contact_list_wallets": "マイウォレット"
+  "contact_list_wallets": "マイウォレット",
+  "bitcoin_payments_require_1_confirmation": "ビットコインの支払いには 1 回の確認が必要で、これには 20 分以上かかる場合があります。お待ち頂きまして、ありがとうございます！支払いが確認されると、メールが送信されます。"
 }
diff --git a/res/values/strings_ko.arb b/res/values/strings_ko.arb
index b7678fa85..f1d81dc67 100644
--- a/res/values/strings_ko.arb
+++ b/res/values/strings_ko.arb
@@ -680,5 +680,6 @@
   "unmatched_currencies": "현재 지갑의 통화가 스캔한 QR의 통화와 일치하지 않습니다.",
   "orbot_running_alert": "이 노드에 연결하기 전에 Orbot이 실행 중인지 확인하십시오.",
   "contact_list_contacts": "콘택트 렌즈",
-  "contact_list_wallets": "내 지갑"
+  "contact_list_wallets": "내 지갑",
+  "bitcoin_payments_require_1_confirmation": "비트코인 결제는 1번의 확인이 필요하며 20분 이상이 소요될 수 있습니다. 기다려 주셔서 감사합니다! 결제가 확인되면 이메일이 전송됩니다."
 }
diff --git a/res/values/strings_my.arb b/res/values/strings_my.arb
index 352b8d191..5664e2e0f 100644
--- a/res/values/strings_my.arb
+++ b/res/values/strings_my.arb
@@ -679,5 +679,6 @@
   "tor_only" : "Tor သာ",
   "unmatched_currencies" : "သင့်လက်ရှိပိုက်ဆံအိတ်၏ငွေကြေးသည် စကင်ဖတ်ထားသော QR နှင့် မကိုက်ညီပါ။",
   "contact_list_contacts" : "အဆက်အသွယ်များ",
-  "contact_list_wallets" : "ကျွန်ုပ်၏ ပိုက်ဆံအိတ်များ"
+  "contact_list_wallets" : "ကျွန်ုပ်၏ ပိုက်ဆံအိတ်များ",
+  "bitcoin_payments_require_1_confirmation": "Bitcoin ငွေပေးချေမှုများသည် မိနစ် 20 သို့မဟုတ် ထို့ထက်ပိုကြာနိုင်သည် 1 အတည်ပြုချက် လိုအပ်သည်။ မင်းရဲ့စိတ်ရှည်မှုအတွက် ကျေးဇူးတင်ပါတယ်။ ငွေပေးချေမှုကို အတည်ပြုပြီးသောအခါ သင့်ထံ အီးမေးလ်ပို့ပါမည်။"
 }
diff --git a/res/values/strings_nl.arb b/res/values/strings_nl.arb
index 802c0e9ac..3591629e5 100644
--- a/res/values/strings_nl.arb
+++ b/res/values/strings_nl.arb
@@ -680,5 +680,6 @@
   "unmatched_currencies": "De valuta van uw huidige portemonnee komt niet overeen met die van de gescande QR",
   "orbot_running_alert": "Zorg ervoor dat Orbot actief is voordat u verbinding maakt met dit knooppunt.",
   "contact_list_contacts": "Contacten",
-  "contact_list_wallets": "Mijn portefeuilles"
+  "contact_list_wallets": "Mijn portefeuilles",
+  "bitcoin_payments_require_1_confirmation": "Bitcoin-betalingen vereisen 1 bevestiging, wat 20 minuten of langer kan duren. Dank voor uw geduld! U ontvangt een e-mail wanneer de betaling is bevestigd."
 }
diff --git a/res/values/strings_pl.arb b/res/values/strings_pl.arb
index 1b49c6ef1..977825b65 100644
--- a/res/values/strings_pl.arb
+++ b/res/values/strings_pl.arb
@@ -680,5 +680,6 @@
   "tor_only": "Tylko sieć Tor",
   "unmatched_currencies": "Waluta Twojego obecnego portfela nie zgadza się z waluctą zeskanowanego kodu QR",
   "contact_list_contacts": "Łączność",
-  "contact_list_wallets": "Moje portfele"
+  "contact_list_wallets": "Moje portfele",
+  "bitcoin_payments_require_1_confirmation": "Płatności Bitcoin wymagają 1 potwierdzenia, co może zająć 20 minut lub dłużej. Dziękuję za cierpliwość! Otrzymasz wiadomość e-mail, gdy płatność zostanie potwierdzona."
 }
diff --git a/res/values/strings_pt.arb b/res/values/strings_pt.arb
index 8daba6193..d0cee4fde 100644
--- a/res/values/strings_pt.arb
+++ b/res/values/strings_pt.arb
@@ -679,5 +679,6 @@
   "unmatched_currencies": "A moeda da sua carteira atual não corresponde à do QR digitalizado",
   "orbot_running_alert": "Certifique-se de que o Orbot esteja em execução antes de se conectar a este nó.",
   "contact_list_contacts": "Contatos",
-  "contact_list_wallets": "minhas carteiras"
+  "contact_list_wallets": "minhas carteiras",
+  "bitcoin_payments_require_1_confirmation": "Os pagamentos em Bitcoin exigem 1 confirmação, o que pode levar 20 minutos ou mais. Obrigado pela sua paciência! Você receberá um e-mail quando o pagamento for confirmado."
 }
diff --git a/res/values/strings_ru.arb b/res/values/strings_ru.arb
index 17640af6d..85c3e38f0 100644
--- a/res/values/strings_ru.arb
+++ b/res/values/strings_ru.arb
@@ -680,5 +680,6 @@
   "unmatched_currencies": "Валюта вашего текущего кошелька не соответствует валюте отсканированного QR-кода.",
   "orbot_running_alert": "Перед подключением к этому узлу убедитесь, что Orbot запущен.",
   "contact_list_contacts": "Контакты",
-  "contact_list_wallets": "Мои кошельки"
+  "contact_list_wallets": "Мои кошельки",
+  "bitcoin_payments_require_1_confirmation": "Биткойн-платежи требуют 1 подтверждения, что может занять 20 минут или дольше. Спасибо тебе за твое терпение! Вы получите электронное письмо, когда платеж будет подтвержден."
 }
diff --git a/res/values/strings_th.arb b/res/values/strings_th.arb
index 6934d9630..c13dff6ac 100644
--- a/res/values/strings_th.arb
+++ b/res/values/strings_th.arb
@@ -678,5 +678,6 @@
   "unmatched_currencies" : "สกุลเงินของกระเป๋าปัจจุบันของคุณไม่ตรงกับของ QR ที่สแกน",
   "orbot_running_alert": "โปรดตรวจสอบว่า Orbot กำลังทำงานก่อนที่จะเชื่อมต่อกับโหนดนี้",
   "contact_list_contacts": "ติดต่อ",
-  "contact_list_wallets": "กระเป๋าเงินของฉัน"
+  "contact_list_wallets": "กระเป๋าเงินของฉัน",
+  "bitcoin_payments_require_1_confirmation": "การชำระเงินด้วย Bitcoin ต้องการการยืนยัน 1 ครั้ง ซึ่งอาจใช้เวลา 20 นาทีหรือนานกว่านั้น ขอบคุณสำหรับความอดทนของคุณ! คุณจะได้รับอีเมลเมื่อการชำระเงินได้รับการยืนยัน"
 }
diff --git a/res/values/strings_tr.arb b/res/values/strings_tr.arb
index 678b3609f..a6b286ce2 100644
--- a/res/values/strings_tr.arb
+++ b/res/values/strings_tr.arb
@@ -679,5 +679,6 @@
   "tor_only": "Yalnızca Tor",
   "unmatched_currencies": "Mevcut cüzdanınızın para birimi taranan QR ile eşleşmiyor",
   "contact_list_contacts": "Rehberim",
-  "contact_list_wallets": "Cüzdanlarım"
+  "contact_list_wallets": "Cüzdanlarım",
+  "bitcoin_payments_require_1_confirmation": "Bitcoin ödemeleri, 20 dakika veya daha uzun sürebilen 1 onay gerektirir. Sabrınız için teşekkürler! Ödeme onaylandığında e-posta ile bilgilendirileceksiniz."
 }
diff --git a/res/values/strings_uk.arb b/res/values/strings_uk.arb
index b9311e8ef..bb2f13370 100644
--- a/res/values/strings_uk.arb
+++ b/res/values/strings_uk.arb
@@ -679,5 +679,6 @@
   "unmatched_currencies": "Валюта вашого гаманця не збігається з валютою сканованого QR-коду",
   "orbot_running_alert": "Перед підключенням до цього вузла переконайтеся, що Orbot запущено.",
   "contact_list_contacts": "Контакти",
-  "contact_list_wallets": "Мої гаманці"
+  "contact_list_wallets": "Мої гаманці",
+  "bitcoin_payments_require_1_confirmation": "Платежі Bitcoin потребують 1 підтвердження, яке може зайняти 20 хвилин або більше. Дякую за Ваше терпіння! Ви отримаєте електронний лист, коли платіж буде підтверджено."
 }
diff --git a/res/values/strings_zh.arb b/res/values/strings_zh.arb
index 5b6608671..e3afa5472 100644
--- a/res/values/strings_zh.arb
+++ b/res/values/strings_zh.arb
@@ -678,5 +678,6 @@
   "unmatched_currencies": "您当前钱包的货币与扫描的 QR 的货币不匹配",
   "orbot_running_alert": "请确保 Orbot 在连接到此节点之前正在运行。",
   "contact_list_contacts": "联系人",
-  "contact_list_wallets": "我的钱包"
+  "contact_list_wallets": "我的钱包",
+  "bitcoin_payments_require_1_confirmation": "比特币支付需要 1 次确认，这可能需要 20 分钟或更长时间。谢谢你的耐心！确认付款后，您将收到电子邮件。"
 }

From 337e311d4f23e8e9eba5c2f801185a3e7aaabca1 Mon Sep 17 00:00:00 2001
From: Serhii <borodenko.sv@gmail.com>
Date: Wed, 25 Jan 2023 18:21:10 +0200
Subject: [PATCH 2/4] Update Cake Pay checkout wording

---
 lib/src/screens/ionia/cards/ionia_payment_status_page.dart | 3 ++-
 lib/view_model/ionia/ionia_payment_status_view_model.dart  | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/src/screens/ionia/cards/ionia_payment_status_page.dart b/lib/src/screens/ionia/cards/ionia_payment_status_page.dart
index e02a3cee8..4096560db 100644
--- a/lib/src/screens/ionia/cards/ionia_payment_status_page.dart
+++ b/lib/src/screens/ionia/cards/ionia_payment_status_page.dart
@@ -157,7 +157,8 @@ class _IoniaPaymentStatusPageBodyBodyState extends State<_IoniaPaymentStatusPage
             Container(
               padding: EdgeInsets.only(left: 40, right: 40, bottom: 20),
               child: Text(
-                S.of(context).proceed_after_one_minute,
+                widget.viewModel.payingByBitcoin ? S.of(context).bitcoin_payments_require_1_confirmation
+                    : S.of(context).proceed_after_one_minute,
                 style: textMedium(
                   color: Theme.of(context).primaryTextTheme!.headline6!.color!,
                 ).copyWith(fontWeight: FontWeight.w500),
diff --git a/lib/view_model/ionia/ionia_payment_status_view_model.dart b/lib/view_model/ionia/ionia_payment_status_view_model.dart
index 19f5f8537..8f43e0244 100644
--- a/lib/view_model/ionia/ionia_payment_status_view_model.dart
+++ b/lib/view_model/ionia/ionia_payment_status_view_model.dart
@@ -1,4 +1,5 @@
 import 'dart:async';
+import 'package:cake_wallet/anypay/any_pay_chain.dart';
 import 'package:mobx/mobx.dart';
 import 'package:flutter/foundation.dart';
 import 'package:cake_wallet/ionia/ionia_service.dart';
@@ -39,6 +40,8 @@ abstract class IoniaPaymentStatusViewModelBase with Store {
 
   Timer? get timer => _timer;
 
+  bool get payingByBitcoin => paymentInfo.anyPayPayment.chain == AnyPayChain.btc;
+
   Timer? _timer;
 
   @action

From 084659e052e9d1afda010137762a3bcf68096e46 Mon Sep 17 00:00:00 2001
From: Serhii <borodenko.sv@gmail.com>
Date: Wed, 25 Jan 2023 19:15:18 +0200
Subject: [PATCH 3/4] minor fixes

---
 res/values/strings_th.arb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/values/strings_th.arb b/res/values/strings_th.arb
index 68f71d476..c04cea5a6 100644
--- a/res/values/strings_th.arb
+++ b/res/values/strings_th.arb
@@ -681,5 +681,5 @@
   "contact_list_wallets": "กระเป๋าเงินของฉัน",
   "bitcoin_payments_require_1_confirmation": "การชำระเงินด้วย Bitcoin ต้องการการยืนยัน 1 ครั้ง ซึ่งอาจใช้เวลา 20 นาทีหรือนานกว่านั้น ขอบคุณสำหรับความอดทนของคุณ! คุณจะได้รับอีเมลเมื่อการชำระเงินได้รับการยืนยัน",
   "do_not_send": "อย่าส่ง",
-  "error_dialog_content": "อ๊ะ เราพบข้อผิดพลาดบางอย่าง\n\nโปรดส่งรายงานข้อขัดข้องไปยังทีมสนับสนุนของเราเพื่อปรับปรุงแอปพลิเคชันให้ดียิ่งขึ้น",
+  "error_dialog_content": "อ๊ะ เราพบข้อผิดพลาดบางอย่าง\n\nโปรดส่งรายงานข้อขัดข้องไปยังทีมสนับสนุนของเราเพื่อปรับปรุงแอปพลิเคชันให้ดียิ่งขึ้น"
 }

From 7425beb1ed85a13206119aa000c9d41f09f38b87 Mon Sep 17 00:00:00 2001
From: Serhii <borodenko.sv@gmail.com>
Date: Thu, 2 Feb 2023 13:00:44 +0200
Subject: [PATCH 4/4] Update localization variable

---
 .../screens/send/widgets/extract_address_from_parsed.dart   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/src/screens/send/widgets/extract_address_from_parsed.dart b/lib/src/screens/send/widgets/extract_address_from_parsed.dart
index ab5778739..a293835a3 100644
--- a/lib/src/screens/send/widgets/extract_address_from_parsed.dart
+++ b/lib/src/screens/send/widgets/extract_address_from_parsed.dart
@@ -20,17 +20,17 @@ Future<String> extractAddressFromParsed(
       break;
     case ParseFrom.openAlias:
       title = S.of(context).address_detected;
-      content = S.of(context).openalias_alert_content('${parsedAddress.name} (OpenAlias)');
+      content = S.of(context).extracted_address_content('${parsedAddress.name} (OpenAlias)');
       address = parsedAddress.addresses.first;
       break;
     case ParseFrom.fio:
       title = S.of(context).address_detected;
-      content = S.of(context).openalias_alert_content('${parsedAddress.name} (FIO)');
+      content = S.of(context).extracted_address_content('${parsedAddress.name} (FIO)');
       address = parsedAddress.addresses.first;
       break;
     case ParseFrom.twitter:
       title = S.of(context).address_detected;
-      content = S.of(context).openalias_alert_content('${parsedAddress.name} (Twitter)');
+      content = S.of(context).extracted_address_content('${parsedAddress.name} (Twitter)');
       address = parsedAddress.addresses.first;
       break;
     case ParseFrom.yatRecord: