From cce56a61a36bfe3a753aa368d003d1a5037f4828 Mon Sep 17 00:00:00 2001
From: Serhii <borodenko.sv@gmail.com>
Date: Thu, 26 Jan 2023 13:33:33 +0200
Subject: [PATCH] minor fixes

---
 lib/view_model/exchange/exchange_trade_view_model.dart | 7 ++++---
 res/values/strings_ar.arb                              | 4 ++--
 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                              | 4 ++--
 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_my.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_th.arb                              | 4 ++--
 res/values/strings_tr.arb                              | 4 +++-
 res/values/strings_uk.arb                              | 4 ++--
 res/values/strings_zh.arb                              | 4 ++--
 20 files changed, 44 insertions(+), 39 deletions(-)

diff --git a/lib/view_model/exchange/exchange_trade_view_model.dart b/lib/view_model/exchange/exchange_trade_view_model.dart
index 8b578faa5..541b74396 100644
--- a/lib/view_model/exchange/exchange_trade_view_model.dart
+++ b/lib/view_model/exchange/exchange_trade_view_model.dart
@@ -119,6 +119,8 @@ abstract class ExchangeTradeViewModelBase with Store {
   }
 
   void _updateItems() {
+    final tagFrom = trade.from.tag != null ? '${trade.from.tag}' + ' ' : '';
+    final tagTo = trade.to.tag != null ? '${trade.to.tag}' + ' ' : '';
     items.clear();
     items.add(ExchangeTradeItem(
         title: "${trade.provider.title} ${S.current.id}", data: '${trade.id}', isCopied: true));
@@ -135,13 +137,12 @@ abstract class ExchangeTradeViewModelBase with Store {
 
     items.addAll([
       ExchangeTradeItem(title: S.current.amount, data: '${trade.amount}', isCopied: false),
-      ExchangeTradeItem(title: S.current.status, data: '${trade.state}', isCopied: false),
       ExchangeTradeItem(
-          title: S.current.send_to_this_address('${trade.from} ${trade.from.tag ?? ''}') + ':',
+          title: S.current.send_to_this_address('${trade.from}', tagFrom) + ':',
           data: trade.inputAddress ?? '',
           isCopied: true),
       ExchangeTradeItem(
-          title: S.current.arrive_in_this_address('${trade.to} ${trade.to.tag ?? ''}') + ':',
+          title: S.current.arrive_in_this_address('${trade.to}', tagTo) + ':',
           data: trade.payoutAddress ?? '',
           isCopied: true),
     ]);
diff --git a/res/values/strings_ar.arb b/res/values/strings_ar.arb
index 7d7994b1e..e111bb467 100644
--- a/res/values/strings_ar.arb
+++ b/res/values/strings_ar.arb
@@ -679,6 +679,6 @@
    "tor_only":"Tor فقط",
    "unmatched_currencies": "عملة محفظتك الحالية لا تتطابق مع عملة QR الممسوحة ضوئيًا",
    "orbot_running_alert": "يرجى التأكد من تشغيل Orbot قبل الاتصال بهذه العقدة.",
-   "send_to_this_address" : "أرسل ${currency} إلى هذا العنوان",
-   "arrive_in_this_address" : "سيصل ${currency} إلى هذا العنوان"
+   "send_to_this_address" : "أرسل ${currency} ${tag}إلى هذا العنوان",
+   "arrive_in_this_address" : "سيصل ${currency} ${tag}إلى هذا العنوان"
 }
diff --git a/res/values/strings_de.arb b/res/values/strings_de.arb
index 8a9e90c5e..018aa7e7c 100644
--- a/res/values/strings_de.arb
+++ b/res/values/strings_de.arb
@@ -681,8 +681,8 @@
   "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",
-  "send_to_this_address" : "Senden Sie ${currency} an diese Adresse",
-  "arrive_in_this_address" : "${currency} wird an dieser Adresse ankommen",
+  "send_to_this_address" : "Senden Sie ${currency} ${tag}an diese Adresse",
+  "arrive_in_this_address" : "${currency} ${tag}wird an dieser Adresse ankommen",
   "do_not_send": "Nicht senden",
   "error_dialog_content": "Hoppla, wir haben einen Fehler.\n\nBitte senden Sie den Absturzbericht an unser Support-Team, um die Anwendung zu verbessern."
 }
diff --git a/res/values/strings_en.arb b/res/values/strings_en.arb
index 7718f3c39..24baded77 100644
--- a/res/values/strings_en.arb
+++ b/res/values/strings_en.arb
@@ -681,8 +681,8 @@
   "orbot_running_alert": "Please make sure Orbot is running prior to connecting to this node.",
   "contact_list_contacts": "Contacts",
   "contact_list_wallets": "My Wallets",
-  "send_to_this_address" : "Send ${currency} to this address",
-  "arrive_in_this_address" : "${currency} will arrive in this address",
+  "send_to_this_address" : "Send ${currency} ${tag}to this address",
+  "arrive_in_this_address" : "${currency} ${tag}will arrive in this address",
   "do_not_send": "Don't send",
   "error_dialog_content": "Oops, we got some error.\n\nPlease send the crash report to our support team to make the application better."
 }
diff --git a/res/values/strings_es.arb b/res/values/strings_es.arb
index 999f0bc47..82889df37 100644
--- a/res/values/strings_es.arb
+++ b/res/values/strings_es.arb
@@ -681,8 +681,8 @@
   "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",
-  "send_to_this_address" : "Enviar ${currency} a esta dirección",
-  "arrive_in_this_address" : "${currency} llegará a esta dirección",
+  "send_to_this_address" : "Enviar ${currency} ${tag}a esta dirección",
+  "arrive_in_this_address" : "${currency} ${tag}llegará a esta dirección",
   "do_not_send": "no enviar",
   "error_dialog_content": "Vaya, tenemos un error.\n\nEnvíe el informe de bloqueo a nuestro equipo de soporte para mejorar la aplicación."
 }
diff --git a/res/values/strings_fr.arb b/res/values/strings_fr.arb
index 7fcf71478..a3288f958 100644
--- a/res/values/strings_fr.arb
+++ b/res/values/strings_fr.arb
@@ -679,8 +679,8 @@
   "orbot_running_alert": "Veuillez vous assurer qu'Orbot est en cours d'exécution avant de vous connecter à ce nœud.",
   "contact_list_contacts": "Contacts",
   "contact_list_wallets": "Mes portefeuilles (wallets)",
-  "send_to_this_address" : "Envoyez ${currency} à cette adresse",
-  "arrive_in_this_address" : "${currency} arrivera à cette adresse",
+  "send_to_this_address" : "Envoyez ${currency} ${tag}à cette adresse",
+  "arrive_in_this_address" : "${currency} ${tag}arrivera à cette adresse",
   "do_not_send": "N'envoyez pas",
   "error_dialog_content": "Oups, nous avons eu une erreur.\n\nVeuillez envoyer le rapport de plantage à notre équipe d'assistance pour améliorer l'application."
 }
diff --git a/res/values/strings_hi.arb b/res/values/strings_hi.arb
index 9127fb576..7ec7de38d 100644
--- a/res/values/strings_hi.arb
+++ b/res/values/strings_hi.arb
@@ -681,8 +681,8 @@
   "orbot_running_alert": "कृपया सुनिश्चित करें कि इस नोड से कनेक्ट करने से पहले Orbot चल रहा है।",
   "contact_list_contacts": "संपर्क",
   "contact_list_wallets": "मेरा बटुआ",
-  "send_to_this_address" : "इस पते पर ${currency} भेजें",
-  "arrive_in_this_address" : "${currency} इस पते पर पहुंचेंगे",
+  "send_to_this_address" : "इस पते पर ${currency} ${tag}भेजें",
+  "arrive_in_this_address" : "${currency} ${tag}इस पते पर पहुंचेंगे",
   "do_not_send": "मत भेजो",
   "error_dialog_content": "ओह, हमसे कुछ गड़बड़ी हुई है.\n\nएप्लिकेशन को बेहतर बनाने के लिए कृपया क्रैश रिपोर्ट हमारी सहायता टीम को भेजें।"
 }
diff --git a/res/values/strings_hr.arb b/res/values/strings_hr.arb
index 0f097a087..79bad1e66 100644
--- a/res/values/strings_hr.arb
+++ b/res/values/strings_hr.arb
@@ -681,8 +681,8 @@
   "orbot_running_alert": "Provjerite radi li Orbot prije spajanja na ovaj čvor.",
   "contact_list_contacts": "Kontakti",
   "contact_list_wallets": "Moji novčanici",
-  "send_to_this_address" : "Pošaljite ${currency} na ovu adresu",
-  "arrive_in_this_address" : "${currency} će stići na ovu adresu",
+  "send_to_this_address" : "Pošaljite ${currency} ${tag}na ovu adresu",
+  "arrive_in_this_address" : "${currency} ${tag}će stići na ovu adresu",
   "do_not_send": "Ne šalji",
   "error_dialog_content": "Ups, imamo grešku.\n\nPošaljite izvješće o padu našem timu za podršku kako bismo poboljšali aplikaciju."
 }
diff --git a/res/values/strings_it.arb b/res/values/strings_it.arb
index 3f78da499..28f502cd6 100644
--- a/res/values/strings_it.arb
+++ b/res/values/strings_it.arb
@@ -681,8 +681,8 @@
   "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",
-  "send_to_this_address" : "Invia ${currency} a questo indirizzo",
-  "arrive_in_this_address" : "${currency} arriverà a questo indirizzo",
+  "send_to_this_address" : "Invia ${currency} ${tag}a questo indirizzo",
+  "arrive_in_this_address" : "${currency} ${tag}arriverà a questo indirizzo",
   "do_not_send": "Non inviare",
   "error_dialog_content": "Ups, imamo grešku.\n\nPošaljite izvješće o padu našem timu za podršku kako bismo poboljšali aplikaciju."
 }
diff --git a/res/values/strings_ja.arb b/res/values/strings_ja.arb
index 50aacb432..f1a05b987 100644
--- a/res/values/strings_ja.arb
+++ b/res/values/strings_ja.arb
@@ -681,8 +681,8 @@
   "orbot_running_alert": "このノードに接続する前に、Orbot が実行されていることを確認してください",
   "contact_list_contacts": "連絡先",
   "contact_list_wallets": "マイウォレット",
-  "send_to_this_address" : "${currency} をこのアドレスに送金",
-  "arrive_in_this_address" : "${currency} はこの住所に到着します",
+  "send_to_this_address" : "${currency} ${tag}をこのアドレスに送金",
+  "arrive_in_this_address" : "${currency} ${tag}はこの住所に到着します",
   "do_not_send": "送信しない",
   "error_dialog_content": "Spiacenti, abbiamo riscontrato un errore.\n\nSi prega di inviare il rapporto sull'arresto anomalo al nostro team di supporto per migliorare l'applicazione."
 }
diff --git a/res/values/strings_ko.arb b/res/values/strings_ko.arb
index d84014e55..fa8565e6d 100644
--- a/res/values/strings_ko.arb
+++ b/res/values/strings_ko.arb
@@ -681,8 +681,8 @@
   "orbot_running_alert": "이 노드에 연결하기 전에 Orbot이 실행 중인지 확인하십시오.",
   "contact_list_contacts": "콘택트 렌즈",
   "contact_list_wallets": "내 지갑",
-  "send_to_this_address" : "이 주소로 ${currency} 송금",
-  "arrive_in_this_address" : "${currency}이(가) 이 주소로 도착합니다",
+  "send_to_this_address" : "이 주소로 ${currency} ${tag}송금",
+  "arrive_in_this_address" : "${currency} ${tag}이(가) 이 주소로 도착합니다",
   "do_not_send": "보내지 마세요",
   "error_dialog_content": "죄송합니다. 오류가 발생했습니다.\n\n응용 프로그램을 개선하려면 지원 팀에 충돌 보고서를 보내주십시오."
 }
diff --git a/res/values/strings_my.arb b/res/values/strings_my.arb
index 352b8d191..0979948c1 100644
--- a/res/values/strings_my.arb
+++ b/res/values/strings_my.arb
@@ -679,5 +679,7 @@
   "tor_only" : "Tor သာ",
   "unmatched_currencies" : "သင့်လက်ရှိပိုက်ဆံအိတ်၏ငွေကြေးသည် စကင်ဖတ်ထားသော QR နှင့် မကိုက်ညီပါ။",
   "contact_list_contacts" : "အဆက်အသွယ်များ",
-  "contact_list_wallets" : "ကျွန်ုပ်၏ ပိုက်ဆံအိတ်များ"
+  "contact_list_wallets" : "ကျွန်ုပ်၏ ပိုက်ဆံအိတ်များ",
+  "send_to_this_address" : "ဤလိပ်စာသို့ ${currency} ${tag}သို့ ပို့ပါ။",
+  "arrive_in_this_address" : "${currency} ${tag}ဤလိပ်စာသို့ ရောက်ရှိပါမည်။"
 }
diff --git a/res/values/strings_nl.arb b/res/values/strings_nl.arb
index 67613d461..c10b1722f 100644
--- a/res/values/strings_nl.arb
+++ b/res/values/strings_nl.arb
@@ -681,8 +681,8 @@
   "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",
-  "send_to_this_address" : "Stuur ${currency} naar dit adres",
-  "arrive_in_this_address" : "${currency} komt aan op dit adres",
+  "send_to_this_address" : "Stuur ${currency} ${tag}naar dit adres",
+  "arrive_in_this_address" : "${currency} ${tag}komt aan op dit adres",
   "do_not_send": "Niet sturen",
   "error_dialog_content": "Oeps, er is een fout opgetreden.\n\nStuur het crashrapport naar ons ondersteuningsteam om de applicatie te verbeteren."
 }
diff --git a/res/values/strings_pl.arb b/res/values/strings_pl.arb
index a38da0e28..72b93a08b 100644
--- a/res/values/strings_pl.arb
+++ b/res/values/strings_pl.arb
@@ -681,8 +681,8 @@
   "orbot_running_alert": "Upewnij się, że Orbot działa przed połączeniem z tym węzłem.",
   "contact_list_contacts": "Łączność",
   "contact_list_wallets": "Moje portfele",
-  "send_to_this_address" : "Wyślij ${currency} na ten adres",
-  "arrive_in_this_address" : "${currency} dotrze na ten adres",
+  "send_to_this_address" : "Wyślij ${currency} ${tag}na ten adres",
+  "arrive_in_this_address" : "${currency} ${tag}dotrze na ten adres",
   "do_not_send": "Nie wysyłaj",
   "error_dialog_content": "Ups, wystąpił błąd.\n\nPrześlij raport o awarii do naszego zespołu wsparcia, aby ulepszyć aplikację."
 }
diff --git a/res/values/strings_pt.arb b/res/values/strings_pt.arb
index 8d81eda26..4ed4df754 100644
--- a/res/values/strings_pt.arb
+++ b/res/values/strings_pt.arb
@@ -680,8 +680,8 @@
   "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",
-  "send_to_this_address" : "Envie ${currency} para este endereço",
-  "arrive_in_this_address" : "${currency} chegará neste endereço",
+  "send_to_this_address" : "Envie ${currency} ${tag}para este endereço",
+  "arrive_in_this_address" : "${currency} ${tag}chegará neste endereço",
   "do_not_send": "não envie",
   "error_dialog_content": "Ops, houve algum erro.\n\nPor favor, envie o relatório de falha para nossa equipe de suporte para melhorar o aplicativo."
 }
diff --git a/res/values/strings_ru.arb b/res/values/strings_ru.arb
index 161d33580..8482a1bda 100644
--- a/res/values/strings_ru.arb
+++ b/res/values/strings_ru.arb
@@ -681,8 +681,8 @@
   "orbot_running_alert": "Перед подключением к этому узлу убедитесь, что Orbot запущен.",
   "contact_list_contacts": "Контакты",
   "contact_list_wallets": "Мои кошельки",
-  "send_to_this_address" : "Отправить ${currency} на этот адрес",
-  "arrive_in_this_address" : "${currency} придет на этот адрес",
+  "send_to_this_address" : "Отправить ${currency} ${tag}на этот адрес",
+  "arrive_in_this_address" : "${currency} ${tag}придет на этот адрес",
   "do_not_send": "Не отправлять",
   "error_dialog_content": "Ой, у нас какая-то ошибка.\n\nПожалуйста, отправьте отчет о сбое в нашу службу поддержки, чтобы сделать приложение лучше."
 }
diff --git a/res/values/strings_th.arb b/res/values/strings_th.arb
index 0104bbb02..8e108f6c7 100644
--- a/res/values/strings_th.arb
+++ b/res/values/strings_th.arb
@@ -679,8 +679,8 @@
   "orbot_running_alert": "โปรดตรวจสอบว่า Orbot กำลังทำงานก่อนที่จะเชื่อมต่อกับโหนดนี้",
   "contact_list_contacts": "ติดต่อ",
   "contact_list_wallets": "กระเป๋าเงินของฉัน",
-  "send_to_this_address" : "ส่ง ${currency} ไปยังที่อยู่นี้",
-  "arrive_in_this_address" : "${currency} จะมาถึงที่อยู่นี้",
+  "send_to_this_address" : "ส่ง ${currency} ${tag}ไปยังที่อยู่นี้",
+  "arrive_in_this_address" : "${currency} ${tag}จะมาถึงที่อยู่นี้",
   "do_not_send": "อย่าส่ง",
   "error_dialog_content": "อ๊ะ เราพบข้อผิดพลาดบางอย่าง\n\nโปรดส่งรายงานข้อขัดข้องไปยังทีมสนับสนุนของเราเพื่อปรับปรุงแอปพลิเคชันให้ดียิ่งขึ้น"
 }
diff --git a/res/values/strings_tr.arb b/res/values/strings_tr.arb
index 678b3609f..46f7213d4 100644
--- a/res/values/strings_tr.arb
+++ b/res/values/strings_tr.arb
@@ -679,5 +679,7 @@
   "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",
+  "send_to_this_address" : "Bu adrese ${currency} ${tag}gönder",
+  "arrive_in_this_address" : "${currency} ${tag}bu adrese ulaşacak"
 }
diff --git a/res/values/strings_uk.arb b/res/values/strings_uk.arb
index 1f0c2b2ee..2ed7c7fdb 100644
--- a/res/values/strings_uk.arb
+++ b/res/values/strings_uk.arb
@@ -680,8 +680,8 @@
   "orbot_running_alert": "Перед підключенням до цього вузла переконайтеся, що Orbot запущено.",
   "contact_list_contacts": "Контакти",
   "contact_list_wallets": "Мої гаманці",
-  "send_to_this_address" : "Надіслати ${currency} на цю адресу",
-  "arrive_in_this_address" : "${currency} надійде на цю адресу",
+  "send_to_this_address" : "Надіслати ${currency} ${tag}на цю адресу",
+  "arrive_in_this_address" : "${currency} ${tag}надійде на цю адресу",
   "do_not_send": "Не надсилайте",
   "error_dialog_content": "На жаль, ми отримали помилку.\n\nБудь ласка, надішліть звіт про збій нашій команді підтримки, щоб покращити додаток."
 }
diff --git a/res/values/strings_zh.arb b/res/values/strings_zh.arb
index e2e8dd82a..7355ac3bd 100644
--- a/res/values/strings_zh.arb
+++ b/res/values/strings_zh.arb
@@ -679,8 +679,8 @@
   "orbot_running_alert": "请确保 Orbot 在连接到此节点之前正在运行。",
   "contact_list_contacts": "联系人",
   "contact_list_wallets": "我的钱包",
-  "send_to_this_address" : "发送 ${currency} 到这个地址",
-  "arrive_in_this_address" : "${currency} 将到达此地址",
+  "send_to_this_address" : "发送 ${currency} ${tag}到这个地址",
+  "arrive_in_this_address" : "${currency} ${tag}将到达此地址",
   "do_not_send": "不要发送",
   "error_dialog_content": "糟糕，我们遇到了一些错误。\n\n请将崩溃报告发送给我们的支持团队，以改进应用程序。"
 }