From 4fb2fc47ad26f08d2eaeffebd486f9cf4e3ffd41 Mon Sep 17 00:00:00 2001 From: Serhii Date: Mon, 16 Jun 2025 17:52:15 +0300 Subject: [PATCH] fix: extra ID for Trocador swap (#2307) --- .../provider/trocador_exchange_provider.dart | 2 ++ .../exchange/exchange_trade_view_model.dart | 24 ++++++++----------- res/values/strings_ar.arb | 1 + res/values/strings_bg.arb | 1 + res/values/strings_cs.arb | 1 + res/values/strings_de.arb | 1 + res/values/strings_en.arb | 1 + res/values/strings_es.arb | 1 + res/values/strings_fr.arb | 1 + res/values/strings_ha.arb | 1 + res/values/strings_hi.arb | 1 + res/values/strings_hr.arb | 1 + res/values/strings_hy.arb | 1 + res/values/strings_id.arb | 1 + res/values/strings_it.arb | 1 + res/values/strings_ja.arb | 1 + res/values/strings_ko.arb | 1 + res/values/strings_my.arb | 1 + res/values/strings_nl.arb | 1 + res/values/strings_pl.arb | 1 + res/values/strings_pt.arb | 1 + res/values/strings_ru.arb | 1 + res/values/strings_th.arb | 1 + res/values/strings_tl.arb | 1 + res/values/strings_tr.arb | 1 + res/values/strings_uk.arb | 1 + res/values/strings_ur.arb | 1 + res/values/strings_vi.arb | 1 + res/values/strings_yo.arb | 1 + res/values/strings_zh.arb | 1 + 30 files changed, 40 insertions(+), 14 deletions(-) diff --git a/lib/exchange/provider/trocador_exchange_provider.dart b/lib/exchange/provider/trocador_exchange_provider.dart index 26a9b2e35..170c53627 100644 --- a/lib/exchange/provider/trocador_exchange_provider.dart +++ b/lib/exchange/provider/trocador_exchange_provider.dart @@ -230,6 +230,7 @@ class TrocadorExchangeProvider extends ExchangeProvider { final providerName = responseJSON['provider'] as String; final amount = responseJSON['amount_from']?.toString(); final receiveAmount = responseJSON['amount_to']?.toString(); + final addressProviderMemo = responseJSON['address_provider_memo'] as String?; return Trade( id: id, @@ -247,6 +248,7 @@ class TrocadorExchangeProvider extends ExchangeProvider { receiveAmount: receiveAmount ?? request.toAmount, payoutAddress: payoutAddress, isSendAll: isSendAll, + extraId: addressProviderMemo, ); } diff --git a/lib/view_model/exchange/exchange_trade_view_model.dart b/lib/view_model/exchange/exchange_trade_view_model.dart index fc7a5429b..76a49e1d5 100644 --- a/lib/view_model/exchange/exchange_trade_view_model.dart +++ b/lib/view_model/exchange/exchange_trade_view_model.dart @@ -96,11 +96,12 @@ abstract class ExchangeTradeViewModelBase with Store { bool isSendable; @computed - String get extraInfo => trade.from == CryptoCurrency.xlm - ? '\n\n' + S.current.xlm_extra_info - : trade.from == CryptoCurrency.xrp - ? '\n\n' + S.current.xrp_extra_info - : ''; + String get extraInfo => switch (trade.from) { + CryptoCurrency.xlm => '\n\n' + S.current.xlm_extra_info, + CryptoCurrency.xrp => '\n\n' + S.current.xrp_extra_info, + CryptoCurrency.ton => '\n\n' + S.current.ton_extra_info, + _ => '' + }; @computed String get pendingTransactionFiatAmountValueFormatted => sendViewModel.isFiatDisabled @@ -203,12 +204,12 @@ abstract class ExchangeTradeViewModelBase with Store { ]); if (trade.extraId != null) { - final shouldAddExtraId = trade.from == CryptoCurrency.xrp || trade.from == CryptoCurrency.xlm; + final shouldAddExtraId = trade.from == CryptoCurrency.xrp || trade.from == CryptoCurrency.xlm || trade.from == CryptoCurrency.ton; if (shouldAddExtraId) { final title = trade.from == CryptoCurrency.xrp ? S.current.destination_tag - : trade.from == CryptoCurrency.xlm + : trade.from == CryptoCurrency.xlm || trade.from == CryptoCurrency.ton ? S.current.memo : S.current.extra_id; @@ -217,13 +218,8 @@ abstract class ExchangeTradeViewModelBase with Store { title: title, data: '${trade.extraId}', isCopied: true, - isReceiveDetail: (trade.from == CryptoCurrency.xrp || trade.from == CryptoCurrency.xlm) - ? false - : true, - isExternalSendDetail: - (trade.from == CryptoCurrency.xrp || trade.from == CryptoCurrency.xlm) - ? true - : false, + isReceiveDetail: !shouldAddExtraId, + isExternalSendDetail: shouldAddExtraId ), ); } diff --git a/res/values/strings_ar.arb b/res/values/strings_ar.arb index 81f7fcb33..0c63a33b4 100644 --- a/res/values/strings_ar.arb +++ b/res/values/strings_ar.arb @@ -904,6 +904,7 @@ "token_name": "اسم الرمز ، على سبيل المثال: Tether", "token_symbol": "رمز العملة ، على سبيل المثال: USDT", "tokenID": "ﻒﻳﺮﻌﺗ ﺔﻗﺎﻄﺑ", + "ton_extra_info": "يرجى عدم نسيان تحديد معرف المذكرة أثناء إرسال معاملة TON للتبادل", "tor_connection": "ﺭﻮﺗ ﻝﺎﺼﺗﺍ", "tor_only": "Tor فقط", "total": "المجموع", diff --git a/res/values/strings_bg.arb b/res/values/strings_bg.arb index e952d3728..8163da646 100644 --- a/res/values/strings_bg.arb +++ b/res/values/strings_bg.arb @@ -904,6 +904,7 @@ "token_name": "Име на токена, напр.: Tether", "token_symbol": "Символ на токена, напр.: USDT", "tokenID": "документ за самоличност", + "ton_extra_info": "Моля, не забравяйте да посочите идентификационния номер на бележката, докато изпращате транзакцията TON за борсата", "tor_connection": "Tor връзка", "tor_only": "Само чрез Tor", "total": "Обща сума", diff --git a/res/values/strings_cs.arb b/res/values/strings_cs.arb index 1b17c4362..80b386859 100644 --- a/res/values/strings_cs.arb +++ b/res/values/strings_cs.arb @@ -904,6 +904,7 @@ "token_name": "Název tokenu např.: Tether", "token_symbol": "Symbol tokenu, např.: USDT", "tokenID": "ID", + "ton_extra_info": "Při odeslání TON transakce pro výměnu nezapomeňte zadat ID Memo ID", "tor_connection": "Připojení Tor", "tor_only": "Pouze Tor", "total": "Celkový", diff --git a/res/values/strings_de.arb b/res/values/strings_de.arb index 27a312b5c..479954b23 100644 --- a/res/values/strings_de.arb +++ b/res/values/strings_de.arb @@ -905,6 +905,7 @@ "token_name": "Token-Name, z. B.: Tether", "token_symbol": "Token-Symbol, z. B.: USDT", "tokenID": "AUSWEIS", + "ton_extra_info": "Bitte vergessen Sie nicht, die Memo -ID anzugeben, während Sie die TON -Transaktion für den Austausch senden", "tor_connection": "Tor-Verbindung", "tor_only": "Nur Tor", "total": "Gesamt", diff --git a/res/values/strings_en.arb b/res/values/strings_en.arb index 725ab95a3..971a68455 100644 --- a/res/values/strings_en.arb +++ b/res/values/strings_en.arb @@ -905,6 +905,7 @@ "token_name": "Token name eg: Tether", "token_symbol": "Token symbol eg: USDT", "tokenID": "ID", + "ton_extra_info": "Please don’t forget to specify the Memo ID while sending the TON transaction for the exchange", "tor_connection": "Tor connection", "tor_only": "Tor only", "total": "Total", diff --git a/res/values/strings_es.arb b/res/values/strings_es.arb index 7c1bc280c..fe802237a 100644 --- a/res/values/strings_es.arb +++ b/res/values/strings_es.arb @@ -905,6 +905,7 @@ "token_name": "Nombre del token, por ejemplo: Tether", "token_symbol": "Símbolo de token, por ejemplo: USDT", "tokenID": "IDENTIFICACIÓN", + "ton_extra_info": "No olvide especificar el ID de memo mientras envía la transacción TON para el intercambio", "tor_connection": "conexión tor", "tor_only": "solo Tor", "total": "Total", diff --git a/res/values/strings_fr.arb b/res/values/strings_fr.arb index d762c558d..b78ef8bc5 100644 --- a/res/values/strings_fr.arb +++ b/res/values/strings_fr.arb @@ -904,6 +904,7 @@ "token_name": "Nom du token, par exemple : Tether", "token_symbol": "Symbole de token, par exemple : USDT", "tokenID": "IDENTIFIANT", + "ton_extra_info": "N'oubliez pas de spécifier l'identification de la note lors de l'envoi de la transaction TON pour l'échange", "tor_connection": "Connexion Tor", "tor_only": "Tor uniquement", "total": "Total", diff --git a/res/values/strings_ha.arb b/res/values/strings_ha.arb index ad4db22e5..710960b7d 100644 --- a/res/values/strings_ha.arb +++ b/res/values/strings_ha.arb @@ -906,6 +906,7 @@ "token_name": "Alamar sunan misali: Tether", "token_symbol": "Alamar alama misali: USDT", "tokenID": "ID", + "ton_extra_info": "Don Allah kar a manta su saka ID na Memo yayin aikawa da ma'amala don musayar", "tor_connection": "Tor haɗin gwiwa", "tor_only": "Tor kawai", "total": "Duka", diff --git a/res/values/strings_hi.arb b/res/values/strings_hi.arb index 819486206..f0a7efaaf 100644 --- a/res/values/strings_hi.arb +++ b/res/values/strings_hi.arb @@ -906,6 +906,7 @@ "token_name": "टोकन नाम जैसे: टीथर", "token_symbol": "टोकन प्रतीक जैसे: यूएसडीटी", "tokenID": "पहचान", + "ton_extra_info": "कृपया एक्सचेंज के लिए टन लेनदेन भेजते समय मेमो आईडी निर्दिष्ट करना न भूलें", "tor_connection": "टोर कनेक्शन", "tor_only": "Tor केवल", "total": "कुल", diff --git a/res/values/strings_hr.arb b/res/values/strings_hr.arb index 43025f45c..5ecfb5b21 100644 --- a/res/values/strings_hr.arb +++ b/res/values/strings_hr.arb @@ -904,6 +904,7 @@ "token_name": "Naziv tokena npr.: Tether", "token_symbol": "Simbol tokena npr.: USDT", "tokenID": "iskaznica", + "ton_extra_info": "Ne zaboravite navesti ID memorandu", "tor_connection": "Tor veza", "tor_only": "Samo Tor", "total": "Ukupno", diff --git a/res/values/strings_hy.arb b/res/values/strings_hy.arb index 57203b934..5d274c632 100644 --- a/res/values/strings_hy.arb +++ b/res/values/strings_hy.arb @@ -902,6 +902,7 @@ "token_name": "Token-ի անուն, օրինակ՝ Tether", "token_symbol": "Token-ի նշան, օրինակ՝ USDT", "tokenID": "ID", + "ton_extra_info": "Խնդրում ենք մի մոռացեք նշել MEMO ID- ն, երբ փոխանակման համար տոննա գործարքը ուղարկեք", "tor_connection": "Tor կապ", "tor_only": "Միայն Tor", "total": "Ընդհանուր", diff --git a/res/values/strings_id.arb b/res/values/strings_id.arb index b7cf3e84e..b7847badf 100644 --- a/res/values/strings_id.arb +++ b/res/values/strings_id.arb @@ -907,6 +907,7 @@ "token_name": "Nama token misalnya: Tether", "token_symbol": "Simbol token misalnya: USDT", "tokenID": "PENGENAL", + "ton_extra_info": "Harap jangan lupa untuk menentukan ID memo saat mengirim transaksi ton untuk pertukaran", "tor_connection": "koneksi Tor", "tor_only": "Hanya Tor", "total": "Total", diff --git a/res/values/strings_it.arb b/res/values/strings_it.arb index 6edfc837a..a0ff46c4f 100644 --- a/res/values/strings_it.arb +++ b/res/values/strings_it.arb @@ -905,6 +905,7 @@ "token_name": "Nome del token, ad esempio: Tether", "token_symbol": "Simbolo del token, ad esempio: USDT", "tokenID": "ID", + "ton_extra_info": "Non dimenticare di specificare l'ID memo durante l'invio della transazione Ton per lo scambio", "tor_connection": "Connessione Tor", "tor_only": "Solo Tor", "total": "Totale", diff --git a/res/values/strings_ja.arb b/res/values/strings_ja.arb index 60b964f6d..ac8dafbac 100644 --- a/res/values/strings_ja.arb +++ b/res/values/strings_ja.arb @@ -905,6 +905,7 @@ "token_name": "トークン名 例: Tether", "token_symbol": "トークンシンボル 例: USDT", "tokenID": "ID", + "ton_extra_info": "Exchangeのトントランザクションを送信しながら、メモIDを指定することを忘れないでください", "tor_connection": "Tor接続", "tor_only": "Torのみ", "total": "合計", diff --git a/res/values/strings_ko.arb b/res/values/strings_ko.arb index 31a9c5d0b..e2b21aa04 100644 --- a/res/values/strings_ko.arb +++ b/res/values/strings_ko.arb @@ -905,6 +905,7 @@ "token_name": "토큰 이름 (예: Tether)", "token_symbol": "토큰 심볼 (예: USDT)", "tokenID": "ID", + "ton_extra_info": "교환을 위해 TON 트랜잭션을 보내는 동안 메모 ID를 지정하는 것을 잊지 마십시오.", "tor_connection": "Tor 연결", "tor_only": "Tor 전용", "total": "합계", diff --git a/res/values/strings_my.arb b/res/values/strings_my.arb index 9b0bb0025..edafed5d2 100644 --- a/res/values/strings_my.arb +++ b/res/values/strings_my.arb @@ -904,6 +904,7 @@ "token_name": "တိုကင်အမည် ဥပမာ- Tether", "token_symbol": "တိုကင်သင်္ကေတ ဥပမာ- USDT", "tokenID": "အမှတ်သညာ", + "ton_extra_info": "ငွေလဲလှယ်မှုအတွက်တန်ပြန်ငွေပေးငွေယူကိုပို့နေစဉ် Memo ID ကိုသတ်မှတ်ရန်မမေ့ပါနှင့်", "tor_connection": "Tor ချိတ်ဆက်မှု", "tor_only": "Tor သာ", "total": "လုံးဝသော", diff --git a/res/values/strings_nl.arb b/res/values/strings_nl.arb index a58748b4e..c47160a5f 100644 --- a/res/values/strings_nl.arb +++ b/res/values/strings_nl.arb @@ -904,6 +904,7 @@ "token_name": "Tokennaam bijv.: Tether", "token_symbol": "Tokensymbool bijv.: USDT", "tokenID": "ID kaart", + "ton_extra_info": "Vergeet niet om de memo -ID op te geven tijdens het verzenden van de ton -transactie voor de uitwisseling", "tor_connection": "Tor-verbinding", "tor_only": "Alleen Tor", "total": "Totaal", diff --git a/res/values/strings_pl.arb b/res/values/strings_pl.arb index 9dd895716..b3b99e28c 100644 --- a/res/values/strings_pl.arb +++ b/res/values/strings_pl.arb @@ -904,6 +904,7 @@ "token_name": "Nazwa tokena, np.: Tether", "token_symbol": "Symbol tokena np.: USDT", "tokenID": "ID", + "ton_extra_info": "Nie zapomnij określić identyfikatora notatki podczas wysyłania transakcji TON dla wymiany", "tor_connection": "Połączenie przez Tor", "tor_only": "Tylko sieć Tor", "total": "Całkowity", diff --git a/res/values/strings_pt.arb b/res/values/strings_pt.arb index fe54b1fd9..9b55fc7b6 100644 --- a/res/values/strings_pt.arb +++ b/res/values/strings_pt.arb @@ -906,6 +906,7 @@ "token_name": "Nome do token, por exemplo: Tether", "token_symbol": "Símbolo de token, por exemplo: USDT", "tokenID": "EU IA", + "ton_extra_info": "Não se esqueça de especificar o ID do memorando ao enviar a transação TON para a troca", "tor_connection": "Conexão Tor", "tor_only": "Tor apenas", "total": "Total", diff --git a/res/values/strings_ru.arb b/res/values/strings_ru.arb index b1e49867a..3e61f4277 100644 --- a/res/values/strings_ru.arb +++ b/res/values/strings_ru.arb @@ -905,6 +905,7 @@ "token_name": "Имя токена, например: Tether", "token_symbol": "Символ токена, например: USDT", "tokenID": "ИДЕНТИФИКАТОР", + "ton_extra_info": "Пожалуйста, не забудьте указать идентификатор записки при отправке TON транзакции для обмена", "tor_connection": "Тор соединение", "tor_only": "Только Tor", "total": "Общий", diff --git a/res/values/strings_th.arb b/res/values/strings_th.arb index b1913d990..a60f1b332 100644 --- a/res/values/strings_th.arb +++ b/res/values/strings_th.arb @@ -904,6 +904,7 @@ "token_name": "ชื่อโทเค็น เช่น Tether", "token_symbol": "สัญลักษณ์โทเค็น เช่น USDT", "tokenID": "บัตรประจำตัวประชาชน", + "ton_extra_info": "โปรดอย่าลืมระบุรหัสบันทึกในขณะที่ส่งธุรกรรม TON สำหรับการแลกเปลี่ยน", "tor_connection": "การเชื่อมต่อทอร์", "tor_only": "Tor เท่านั้น", "total": "ทั้งหมด", diff --git a/res/values/strings_tl.arb b/res/values/strings_tl.arb index 34adc4ad7..9ed4e13a8 100644 --- a/res/values/strings_tl.arb +++ b/res/values/strings_tl.arb @@ -904,6 +904,7 @@ "token_name": "Pangalan ng token, halimbawa: Tether", "token_symbol": "Simbolo ng token, halimbawa: USDT", "tokenID": "ID", + "ton_extra_info": "Mangyaring huwag kalimutan na tukuyin ang memo ID habang nagpapadala ng toneladang transaksyon para sa palitan", "tor_connection": "Koneksyon ng Tor", "tor_only": "Tor lamang", "total": "Kabuuan", diff --git a/res/values/strings_tr.arb b/res/values/strings_tr.arb index 276f0c174..4d790d1c6 100644 --- a/res/values/strings_tr.arb +++ b/res/values/strings_tr.arb @@ -904,6 +904,7 @@ "token_name": "Belirteç adı, örneğin: Tether", "token_symbol": "Jeton sembolü, örneğin: USDT", "tokenID": "İD", + "ton_extra_info": "Lütfen değişim için ton işlemini gönderirken not kimliğini belirtmeyi unutmayın", "tor_connection": "Tor bağlantısı", "tor_only": "Yalnızca Tor", "total": "Toplam", diff --git a/res/values/strings_uk.arb b/res/values/strings_uk.arb index ac9e34fac..06b6d09e7 100644 --- a/res/values/strings_uk.arb +++ b/res/values/strings_uk.arb @@ -905,6 +905,7 @@ "token_name": "Назва токена, наприклад: Tether", "token_symbol": "Символ маркера, наприклад: USDT", "tokenID": "ID", + "ton_extra_info": "Не забудьте вказати ідентифікатор пам’яті під час надсилання транзакції TON для обміну", "tor_connection": "Підключення Tor", "tor_only": "Тільки Tor", "total": "Загальний", diff --git a/res/values/strings_ur.arb b/res/values/strings_ur.arb index 2a511adf9..c83de672b 100644 --- a/res/values/strings_ur.arb +++ b/res/values/strings_ur.arb @@ -906,6 +906,7 @@ "token_name": "ٹوکن کا نام جیسے: Tether", "token_symbol": "ٹوکن کی علامت جیسے: USDT", "tokenID": "ID", + "ton_extra_info": "ایکسچینج کے لئے ٹن ٹرانزیکشن بھیجتے وقت براہ کرم میمو آئی ڈی کی وضاحت کرنا نہ بھولیں", "tor_connection": "ﻦﺸﮑﻨﮐ ﺭﻮﭨ", "tor_only": "صرف Tor", "total": "کل", diff --git a/res/values/strings_vi.arb b/res/values/strings_vi.arb index 133ddbe30..14eeee189 100644 --- a/res/values/strings_vi.arb +++ b/res/values/strings_vi.arb @@ -901,6 +901,7 @@ "token_name": "Tên token ví dụ: Tether", "token_symbol": "Ký hiệu token ví dụ: USDT", "tokenID": "ID", + "ton_extra_info": "Xin đừng quên chỉ định ID ghi nhớ trong khi gửi giao dịch tấn cho trao đổi", "tor_connection": "Kết nối Tor", "tor_only": "Chỉ Tor", "total": "Tổng cộng", diff --git a/res/values/strings_yo.arb b/res/values/strings_yo.arb index 1d9f8ef88..fee486da4 100644 --- a/res/values/strings_yo.arb +++ b/res/values/strings_yo.arb @@ -905,6 +905,7 @@ "token_name": "Orukọ àmi fun apẹẹrẹ: Tether", "token_symbol": "Aami aami fun apẹẹrẹ: USDT", "tokenID": "ID", + "ton_extra_info": "Jọwọ maṣe gbagbe lati tokasi ID akọsilẹ lakoko fifiranṣẹ idunadura pupọ fun paṣipaarọ naa", "tor_connection": "Tor asopọ", "tor_only": "Tor nìkan", "total": "Apapọ", diff --git a/res/values/strings_zh.arb b/res/values/strings_zh.arb index fd3526e13..ffa8509c4 100644 --- a/res/values/strings_zh.arb +++ b/res/values/strings_zh.arb @@ -904,6 +904,7 @@ "token_name": "代币名称例如：Tether", "token_symbol": "代币符号例如：USDT", "tokenID": "ID", + "ton_extra_info": "请不要忘记在发送TON交易时指定备忘录", "tor_connection": "Tor连接", "tor_only": "仅限 Tor", "total": "全部的",