Merge branch '4.1.0' of github.com:cake-tech/cake_wallet_private into 4.1.0

lib/core/address_validator.dart

@@ -43,7 +43,7 @@ class AddressValidator extends TextValidator {
       case CryptoCurrency.xlm:
         return '[0-9a-zA-Z]';
       case CryptoCurrency.xrp:
-        return '[0-9a-zA-Z]';
+        return '^[0-9a-zA-Z]{34}\$|^X[0-9a-zA-Z]{46}\$';
       default:
         return '[0-9a-zA-Z]';
     }
@@ -54,7 +54,7 @@ class AddressValidator extends TextValidator {
       case CryptoCurrency.xmr:
         return [95, 106];
       case CryptoCurrency.ada:
-        return [59, 92, 105];
+        return [59, 92, 104, 105];
       case CryptoCurrency.bch:
         return [42];
       case CryptoCurrency.bnb:
@@ -82,7 +82,7 @@ class AddressValidator extends TextValidator {
       case CryptoCurrency.xlm:
         return [56];
       case CryptoCurrency.xrp:
-        return [34];
+        return null;
       default:
         return [];
     }

lib/generated/i18n.dart

@@ -76,6 +76,7 @@ class S implements WidgetsLocalizations {
   String get creating_new_wallet => "Creating new wallet";
   String get dark_theme => "Dark";
   String get delete => "Delete";
+  String get destination_tag => "Destination tag:";
   String get digit_pin => "-digit PIN";
   String get edit => "Edit";
   String get enter_your_note => "Enter your note…";
@@ -103,6 +104,7 @@ class S implements WidgetsLocalizations {
   String get exchange_result_write_down_trade_id => "Please copy or write down the trade ID to continue.";
   String get exchange_sync_alert_content => "Please wait until your wallet is synchronized";
   String get expired => "Expired";
+  String get extra_id => "Extra ID:";
   String get faq => "FAQ";
   String get fetching => "Fetching";
   String get filters => "Filter";
@@ -115,6 +117,7 @@ class S implements WidgetsLocalizations {
   String get light_theme => "Light";
   String get loading_your_wallet => "Loading your wallet";
   String get login => "Login";
+  String get memo => "Memo:";
   String get new_node_testing => "New node testing";
   String get new_subaddress_create => "Create";
   String get new_subaddress_label_name => "Label name";
@@ -351,7 +354,7 @@ class S implements WidgetsLocalizations {
   String error_text_maximum_limit(String provider, String max, String currency) => "Trade for ${provider} is not created. Amount is more then maximum: ${max} ${currency}";
   String error_text_minimal_limit(String provider, String min, String currency) => "Trade for ${provider} is not created. Amount is less then minimal: ${min} ${currency}";
   String exchange_result_confirm(String fetchingLabel, String from, String walletName) => "By pressing confirm, you will be sending ${fetchingLabel} ${from} from your wallet called ${walletName} to the address shown below. Or you can send from your external wallet to the below address/QR code.\n\nPlease press confirm to continue or go back to change the amounts.";
-  String exchange_result_description(String fetchingLabel, String from) => "Please send ${fetchingLabel} ${from} to the address shown below.";
+  String exchange_result_description(String fetchingLabel, String from) => "Please send ${fetchingLabel} ${from} to the address shown on the next page.";
   String failed_authentication(String state_error) => "Failed authentication. ${state_error}";
   String max_value(String value, String currency) => "Max: ${value} ${currency}";
   String min_value(String value, String currency) => "Min: ${value} ${currency}";
@@ -655,6 +658,8 @@ class $de extends S {
   @override
   String get expired => "Abgelaufen";
   @override
+  String get extra_id => "Zusätzliche ID:";
+  @override
   String get transaction_priority_regular => "Regulär";
   @override
   String get trade_details_created_at => "Hergestellt in";
@@ -1025,6 +1030,10 @@ class $de extends S {
   @override
   String get account => "Konto";
   @override
+  String get destination_tag => "Ziel-Tag:";
+  @override
+  String get memo => "Memo:";
+  @override
   String change_language_to(String language) => "Ändern Sie die Sprache in ${language}?";
   @override
   String change_current_node(String node) => "Möchten Sie den aktuellen Knoten wirklich auf ändern? ${node}?";
@@ -1077,7 +1086,7 @@ class $de extends S {
   @override
   String error_text_limits_loading_failed(String provider) => "Handel für ${provider} wird nicht erstellt. Das Laden der Limits ist fehlgeschlagen";
   @override
-  String exchange_result_description(String fetchingLabel, String from) => "Bitte senden ${fetchingLabel} ${from} an die unten angegebene Adresse.'";
+  String exchange_result_description(String fetchingLabel, String from) => "Bitte senden ${fetchingLabel} ${from} an die auf der nächsten Seite angegebene Adresse.'";
   @override
   String commit_transaction_amount_fee(String amount, String fee) => "Transaktion festschreiben\nMenge: ${amount}\nGebühr: ${fee}";
   @override
@@ -1377,6 +1386,8 @@ class $hi extends S {
   @override
   String get expired => "समय सीमा समाप्त";
   @override
+  String get extra_id => "अतिरिक्त आईडी:";
+  @override
   String get transaction_priority_regular => "नियमित";
   @override
   String get trade_details_created_at => "पर बनाया गया";
@@ -1747,6 +1758,10 @@ class $hi extends S {
   @override
   String get account => "लेखा";
   @override
+  String get destination_tag => "गंतव्य टैग:";
+  @override
+  String get memo => "ज्ञापन:";
+  @override
   String change_language_to(String language) => "को भाषा बदलें ${language}?";
   @override
   String change_current_node(String node) => "क्या आप वर्तमान नोड को बदलना सुनिश्चित करते हैं ${node}?";
@@ -1799,7 +1814,7 @@ class $hi extends S {
   @override
   String error_text_limits_loading_failed(String provider) => "व्यापार ${provider} के लिए नहीं बनाया गया है। लोडिंग की सीमाएं विफल रहीं";
   @override
-  String exchange_result_description(String fetchingLabel, String from) => "कृपया भेजें ${fetchingLabel} ${from} नीचे दिखाए गए पते पर";
+  String exchange_result_description(String fetchingLabel, String from) => "कृपया भेजें ${fetchingLabel} ${from} अगले पृष्ठ पर दिखाए गए पते पर";
   @override
   String commit_transaction_amount_fee(String amount, String fee) => "लेन-देन करें\nरकम: ${amount}\nशुल्क: ${fee}";
   @override
@@ -2099,6 +2114,8 @@ class $ru extends S {
   @override
   String get expired => "Истекает";
   @override
+  String get extra_id => "Дополнительный ID:";
+  @override
   String get transaction_priority_regular => "Обычный";
   @override
   String get trade_details_created_at => "Создано";
@@ -2469,6 +2486,10 @@ class $ru extends S {
   @override
   String get account => "Аккаунт";
   @override
+  String get destination_tag => "Целевой тег:";
+  @override
+  String get memo => "Памятка:";
+  @override
   String change_language_to(String language) => "Изменить язык на ${language}?";
   @override
   String change_current_node(String node) => "Вы уверены, что хотите изменить текущую ноду на ${node}?";
@@ -2521,7 +2542,7 @@ class $ru extends S {
   @override
   String error_text_limits_loading_failed(String provider) => "Сделка для ${provider} не создана. Ошибка загрузки лимитов";
   @override
-  String exchange_result_description(String fetchingLabel, String from) => "Пожалуйста отправьте ${fetchingLabel} ${from} на адрес, указанный ниже.";
+  String exchange_result_description(String fetchingLabel, String from) => "Пожалуйста отправьте ${fetchingLabel} ${from} на адрес, указанный на следующей странице.";
   @override
   String commit_transaction_amount_fee(String amount, String fee) => "Подтвердить транзакцию \nСумма: ${amount}\nКомиссия: ${fee}";
   @override
@@ -2821,6 +2842,8 @@ class $ko extends S {
   @override
   String get expired => "만료";
   @override
+  String get extra_id => "추가 ID:";
+  @override
   String get transaction_priority_regular => "정규병";
   @override
   String get trade_details_created_at => "에 작성";
@@ -3191,6 +3214,10 @@ class $ko extends S {
   @override
   String get account => "계정";
   @override
+  String get destination_tag => "목적지 태그:";
+  @override
+  String get memo => "메모:";
+  @override
   String change_language_to(String language) => "언어를로 변경 ${language}?";
   @override
   String change_current_node(String node) => "현재 노드를 다음으로 변경 하시겠습니까 ${node}?";
@@ -3243,7 +3270,7 @@ class $ko extends S {
   @override
   String error_text_limits_loading_failed(String provider) => "거래 ${provider} 가 생성되지 않습니다. 로딩 실패";
   @override
-  String exchange_result_description(String fetchingLabel, String from) => "보내주세요 ${fetchingLabel} ${from} 아래 주소로.";
+  String exchange_result_description(String fetchingLabel, String from) => "보내주세요 ${fetchingLabel} ${from} 다음 페이지에 표시된 주소로.";
   @override
   String commit_transaction_amount_fee(String amount, String fee) => "커밋 거래\n양: ${amount}\n보수: ${fee}";
   @override
@@ -3543,6 +3570,8 @@ class $pt extends S {
   @override
   String get expired => "Expirada";
   @override
+  String get extra_id => "ID extra:";
+  @override
   String get transaction_priority_regular => "Regular";
   @override
   String get trade_details_created_at => "Criada em";
@@ -3913,6 +3942,10 @@ class $pt extends S {
   @override
   String get account => "Conta";
   @override
+  String get destination_tag => "Tag de destino:";
+  @override
+  String get memo => "Memorando:";
+  @override
   String change_language_to(String language) => "Alterar idioma para ${language}?";
   @override
   String change_current_node(String node) => "Você realmente deseja alterar o nó atual para ${node}?";
@@ -3965,7 +3998,7 @@ class $pt extends S {
   @override
   String error_text_limits_loading_failed(String provider) => "A troca por ${provider} não é criada. Falha no carregamento dos limites";
   @override
-  String exchange_result_description(String fetchingLabel, String from) => "Por favor, envie ${fetchingLabel} ${from} para o endereço mostrado abaixo.";
+  String exchange_result_description(String fetchingLabel, String from) => "Por favor, envie ${fetchingLabel} ${from} para o endereço mostrado na próxima página.";
   @override
   String commit_transaction_amount_fee(String amount, String fee) => "Confirmar transação\nQuantia: ${amount}\nTaxa: ${fee}";
   @override
@@ -4265,6 +4298,8 @@ class $uk extends S {
   @override
   String get expired => "Закінчується";
   @override
+  String get extra_id => "Додатковий ID:";
+  @override
   String get transaction_priority_regular => "Звичайний";
   @override
   String get trade_details_created_at => "Створено";
@@ -4635,6 +4670,10 @@ class $uk extends S {
   @override
   String get account => "Акаунт";
   @override
+  String get destination_tag => "Тег призначення:";
+  @override
+  String get memo => "Пам’ятка:";
+  @override
   String change_language_to(String language) => "Змінити мову на ${language}?";
   @override
   String change_current_node(String node) => "Ви впевнені, що хочете змінити поточний вузол на ${node}?";
@@ -4687,7 +4726,7 @@ class $uk extends S {
   @override
   String error_text_limits_loading_failed(String provider) => "Операція для ${provider} не створена. Помилка завантаження лімітів";
   @override
-  String exchange_result_description(String fetchingLabel, String from) => "Будь ласка, відправте ${fetchingLabel} ${from} на адресу, вказану нижче.";
+  String exchange_result_description(String fetchingLabel, String from) => "Будь ласка, відправте ${fetchingLabel} ${from} на адресу, вказану на наступній сторінці.";
   @override
   String commit_transaction_amount_fee(String amount, String fee) => "Підтвердити транзакцію \nСума: ${amount}\nКомісія: ${fee}";
   @override
@@ -4987,6 +5026,8 @@ class $ja extends S {
   @override
   String get expired => "期限切れ";
   @override
+  String get extra_id => "追加ID:";
+  @override
   String get transaction_priority_regular => "レギュラー";
   @override
   String get trade_details_created_at => "で作成";
@@ -5357,6 +5398,10 @@ class $ja extends S {
   @override
   String get account => "アカウント";
   @override
+  String get destination_tag => "宛先タグ:";
+  @override
+  String get memo => "メモ:";
+  @override
   String change_language_to(String language) => "言語を変更 ${language}?";
   @override
   String change_current_node(String node) => "現在のノードを変更してよろしいですか ${node}?";
@@ -5409,7 +5454,7 @@ class $ja extends S {
   @override
   String error_text_limits_loading_failed(String provider) => "${provider} の取引は作成されません。 制限の読み込みに失敗しました";
   @override
-  String exchange_result_description(String fetchingLabel, String from) => "送信してください ${fetchingLabel} ${from} 下記の住所へ.";
+  String exchange_result_description(String fetchingLabel, String from) => "送信してください ${fetchingLabel} ${from} 次のページに表示されているアドレスに.";
   @override
   String commit_transaction_amount_fee(String amount, String fee) => "トランザクションをコミット\n量: ${amount}\n費用: ${fee}";
   @override
@@ -5713,6 +5758,8 @@ class $pl extends S {
   @override
   String get expired => "Przedawniony";
   @override
+  String get extra_id => "Dodatkowy ID:";
+  @override
   String get transaction_priority_regular => "Regularny";
   @override
   String get trade_details_created_at => "Utworzono w";
@@ -6083,6 +6130,10 @@ class $pl extends S {
   @override
   String get account => "Konto";
   @override
+  String get destination_tag => "Tag docelowy:";
+  @override
+  String get memo => "Notatka:";
+  @override
   String change_language_to(String language) => "Zmień język na ${language}?";
   @override
   String change_current_node(String node) => "Czy na pewno chcesz przywrócić ustawienia domyślne? ${node}?";
@@ -6135,7 +6186,7 @@ class $pl extends S {
   @override
   String error_text_limits_loading_failed(String provider) => "Wymiana dla ${provider} nie została utworzona. Ładowanie limitów nie powiodło się";
   @override
-  String exchange_result_description(String fetchingLabel, String from) => "Proszę wyślij ${fetchingLabel} ${from} na adres podany poniżej.";
+  String exchange_result_description(String fetchingLabel, String from) => "Proszę wyślij ${fetchingLabel} ${from} pod adres podany na następnej stronie.";
   @override
   String commit_transaction_amount_fee(String amount, String fee) => "Zatwierdź transakcję\nIlość: ${amount}\nOpłata: ${fee}";
   @override
@@ -6435,6 +6486,8 @@ class $es extends S {
   @override
   String get expired => "Muerto";
   @override
+  String get extra_id => "ID adicional:";
+  @override
   String get transaction_priority_regular => "Regular";
   @override
   String get trade_details_created_at => "Creado en";
@@ -6805,6 +6858,10 @@ class $es extends S {
   @override
   String get account => "Cuenta";
   @override
+  String get destination_tag => "Etiqueta de destino:";
+  @override
+  String get memo => "Memorándum:";
+  @override
   String change_language_to(String language) => "Cambiar el idioma a ${language}?";
   @override
   String change_current_node(String node) => "¿Está seguro de cambiar el nodo actual a ${node}?";
@@ -6857,7 +6914,7 @@ class $es extends S {
   @override
   String error_text_limits_loading_failed(String provider) => "El comercio por ${provider} no se crea. Límites de carga fallidos";
   @override
-  String exchange_result_description(String fetchingLabel, String from) => "Envíe ${fetchingLabel} ${from} a la dirección que se muestra a continuación.";
+  String exchange_result_description(String fetchingLabel, String from) => "Envíe ${fetchingLabel} ${from} a la dirección que se muestra en la página siguiente.";
   @override
   String commit_transaction_amount_fee(String amount, String fee) => "Confirmar transacción\nCantidad: ${amount}\nCuota: ${fee}";
   @override
@@ -7157,6 +7214,8 @@ class $nl extends S {
   @override
   String get expired => "Verlopen";
   @override
+  String get extra_id => "Extra ID:";
+  @override
   String get transaction_priority_regular => "Regelmatig";
   @override
   String get trade_details_created_at => "Gemaakt bij";
@@ -7527,6 +7586,10 @@ class $nl extends S {
   @override
   String get account => "Account";
   @override
+  String get destination_tag => "Bestemmingstag:";
+  @override
+  String get memo => "Memo:";
+  @override
   String change_language_to(String language) => "Verander de taal in ${language}?";
   @override
   String change_current_node(String node) => "Weet u zeker dat u het huidige knooppunt wilt wijzigen in ${node}?";
@@ -7579,7 +7642,7 @@ class $nl extends S {
   @override
   String error_text_limits_loading_failed(String provider) => "Ruil voor ${provider} is niet gemaakt. Beperkingen laden mislukt";
   @override
-  String exchange_result_description(String fetchingLabel, String from) => "Zend alstublieft ${fetchingLabel} ${from} naar het onderstaande adres.";
+  String exchange_result_description(String fetchingLabel, String from) => "Zend alstublieft ${fetchingLabel} ${from} naar het adres op de volgende pagina.";
   @override
   String commit_transaction_amount_fee(String amount, String fee) => "Verricht transactie\nBedrag: ${amount}\nhonorarium: ${fee}";
   @override
@@ -7879,6 +7942,8 @@ class $zh extends S {
   @override
   String get expired => "已过期";
   @override
+  String get extra_id => "額外編號:";
+  @override
   String get transaction_priority_regular => "定期";
   @override
   String get trade_details_created_at => "创建于";
@@ -8249,6 +8314,10 @@ class $zh extends S {
   @override
   String get account => "帐户";
   @override
+  String get destination_tag => "目標標籤:";
+  @override
+  String get memo => "備忘錄:";
+  @override
   String change_language_to(String language) => "將語言更改為 ${language}?";
   @override
   String change_current_node(String node) => "您确定将当前节点更改为 ${node}?";
@@ -8301,7 +8370,7 @@ class $zh extends S {
   @override
   String error_text_limits_loading_failed(String provider) => "未創建 ${provider} 交易。 限制加載失敗";
   @override
-  String exchange_result_description(String fetchingLabel, String from) => "请发送 ${fetchingLabel} ${from} 到下面顯示的地址.";
+  String exchange_result_description(String fetchingLabel, String from) => "请发送 ${fetchingLabel} ${from} 到下一頁顯示的地址.";
   @override
   String commit_transaction_amount_fee(String amount, String fee) => "提交交易\n量: ${amount}\nFee: ${fee}";
   @override

lib/src/screens/send/send_page.dart

@@ -43,6 +43,9 @@ class SendPage extends BasePage {
     });
   }
 
+  static const prefixIconWidth = 34.0;
+  static const prefixIconHeight = 34.0;
+
   final SendViewModel sendViewModel;
   final TextEditingController _addressController;
   final TextEditingController _cryptoAmountController;
@@ -172,72 +175,82 @@ class SendPage extends BasePage {
                               Observer(
                                   builder: (_) => Padding(
                                       padding: const EdgeInsets.only(top: 20),
-                                      child: BaseTextFormField(
+                                      child: Stack(
-                                          focusNode: _cryptoAmountFocus,
+                                        children: [
-                                          controller: _cryptoAmountController,
+                                          BaseTextFormField(
-                                          keyboardType:
+                                            focusNode: _cryptoAmountFocus,
-                                              TextInputType.numberWithOptions(
+                                            controller: _cryptoAmountController,
-                                                  signed: false, decimal: true),
+                                            keyboardType:
-                                          prefixIcon: Padding(
+                                            TextInputType.numberWithOptions(
-                                            padding: EdgeInsets.only(top: 9),
+                                                signed: false, decimal: true),
-                                            child: Text(
+                                            prefixIcon: Padding(
-                                                sendViewModel.currency.title +
+                                              padding: EdgeInsets.only(top: 9),
-                                                    ':',
+                                              child: Text(
-                                                style: TextStyle(
+                                                  sendViewModel.currency.title +
-                                                  fontSize: 16,
+                                                      ':',
-                                                  fontWeight: FontWeight.w600,
+                                                  style: TextStyle(
-                                                  color: Colors.white,
+                                                    fontSize: 16,
-                                                )),
+                                                    fontWeight: FontWeight.w600,
-                                          ),
+                                                    color: Colors.white,
-                                          suffixIcon: Container(
+                                                  )),
-                                            height: 32,
-                                            width: 32,
-                                            margin: EdgeInsets.only(
-                                                left: 14, top: 4, bottom: 10),
-                                            decoration: BoxDecoration(
-                                                color: Theme.of(context)
-                                                    .primaryTextTheme
-                                                    .display1
-                                                    .color,
-                                                borderRadius: BorderRadius.all(
-                                                    Radius.circular(6))),
-                                            child: InkWell(
-                                              onTap: () =>
-                                                  sendViewModel.setSendAll(),
-                                              child: Center(
-                                                child: Text(S.of(context).all,
-                                                    textAlign: TextAlign.center,
-                                                    style: TextStyle(
-                                                        fontSize: 12,
-                                                        fontWeight:
-                                                            FontWeight.bold,
-                                                        color: Theme.of(context)
-                                                            .primaryTextTheme
-                                                            .display1
-                                                            .decorationColor)),
-                                              ),
                                             ),
-                                          ),
+                                            suffixIcon: SizedBox(
-                                          hintText: '0.0000',
+                                              width: prefixIconWidth,
-                                          borderColor: Theme.of(context)
+                                            ),
-                                              .primaryTextTheme
+                                            hintText: '0.0000',
-                                              .headline
+                                            borderColor: Theme.of(context)
-                                              .color,
-                                          textStyle: TextStyle(
-                                              fontSize: 14,
-                                              fontWeight: FontWeight.w500,
-                                              color: Colors.white),
-                                          placeholderTextStyle: TextStyle(
-                                              color: Theme.of(context)
                                                   .primaryTextTheme
                                                   .headline
-                                                  .decorationColor,
+                                                  .color,
-                                              fontWeight: FontWeight.w500,
+                                            textStyle: TextStyle(
-                                              fontSize: 14),
+                                                  fontSize: 14,
-                                          validator: sendViewModel.sendAll
+                                                  fontWeight: FontWeight.w500,
+                                                  color: Colors.white),
+                                            placeholderTextStyle: TextStyle(
+                                                  color: Theme.of(context)
+                                                      .primaryTextTheme
+                                                      .headline
+                                                      .decorationColor,
+                                                  fontWeight: FontWeight.w500,
+                                                  fontSize: 14),
+                                            validator: sendViewModel.sendAll
                                               ? sendViewModel.allAmountValidator
                                               : sendViewModel
-                                                  .amountValidator))),
+                                              .amountValidator),
+                                          Positioned(
+                                            top: 2,
+                                            right: 0,
+                                            child: Container(
+                                              width: prefixIconWidth,
+                                              height: prefixIconHeight,
+                                              child: InkWell(
+                                                onTap: () async =>
+                                                    sendViewModel.setSendAll(),
+                                                child: Container(
+                                                  decoration: BoxDecoration(
+                                                    color: Theme.of(context)
+                                                           .primaryTextTheme
+                                                           .display1
+                                                           .color,
+                                                    borderRadius:
+                                                      BorderRadius.all(
+                                                          Radius.circular(6))),
+                                                    child: Center(
+                                                      child: Text(
+                                                        S.of(context).all,
+                                                        textAlign:
+                                                          TextAlign.center,
+                                                        style: TextStyle(
+                                                          fontSize: 12,
+                                                          fontWeight:
+                                                          FontWeight.bold,
+                                                          color:
+                                                            Theme.of(context)
+                                                            .primaryTextTheme
+                                                            .display1
+                                                            .decorationColor))),
+                                                ))))])
+                                  )),
                               Observer(
                                   builder: (_) => Padding(
                                         padding: EdgeInsets.only(top: 10),

lib/view_model/exchange/exchange_trade_view_model.dart

@@ -1,5 +1,6 @@
 import 'dart:async';
 import 'package:cake_wallet/core/wallet_base.dart';
+import 'package:cake_wallet/entities/crypto_currency.dart';
 import 'package:cake_wallet/exchange/changenow/changenow_exchange_provider.dart';
 import 'package:cake_wallet/exchange/exchange_provider.dart';
 import 'package:cake_wallet/exchange/exchange_provider_description.dart';
@@ -96,9 +97,21 @@ abstract class ExchangeTradeViewModelBase with Store {
   void _updateItems() {
     items?.clear();
 
+    items.add(ExchangeTradeItem(
+        title: S.current.id, data: '${trade.id}', isCopied: true));
+
+    if (trade.extraId != null) {
+      final title = trade.from == CryptoCurrency.xrp
+          ? S.current.destination_tag
+          : trade.from == CryptoCurrency.xlm
+                ? S.current.memo
+                : S.current.extra_id;
+
+      items.add(ExchangeTradeItem(
+          title: title, data: '${trade.extraId}', isCopied: false));
+    }
+
     items.addAll([
-      ExchangeTradeItem(
-          title: S.current.id, data: '${trade.id}', isCopied: true),
       ExchangeTradeItem(
           title: S.current.amount, data: '${trade.amount}', isCopied: false),
       ExchangeTradeItem(

res/values/strings_de.arb

@@ -89,7 +89,7 @@
   "trade_is_powered_by" : "Dieser Handel wird betrieben von ${provider}",
   "copy_address" : "Adresse kopieren",
   "exchange_result_confirm" : "Durch Drücken von Bestätigen wird gesendet ${fetchingLabel} ${from} von Ihrer Brieftasche aus angerufen ${walletName} an die unten angegebene Adresse. Oder Sie können von Ihrem externen Portemonnaie an die unten angegebene Adresse / QR-Code senden.\n\nBitte bestätigen Sie, um fortzufahren, oder gehen Sie zurück, um die Beträge zu änderns.",
-  "exchange_result_description" : "Bitte senden ${fetchingLabel} ${from} an die unten angegebene Adresse.'",
+  "exchange_result_description" : "Bitte senden ${fetchingLabel} ${from} an die auf der nächsten Seite angegebene Adresse.'",
   "exchange_result_write_down_ID" : "*Bitte kopieren oder notieren Sie Ihren oben gezeigten Ausweis.",
   "confirm" : "Bestätigen",
   "confirm_sending" : "Bestätigen Sie das Senden",
@@ -435,5 +435,9 @@
   "note_tap_to_change" : "Hinweis (zum Ändern tippen)",
   "transaction_key" : "Transaktionsschlüssel",
   "confirmations" : "Bestätigungen",
-  "recipient_address" : "Empfängeradresse"
+  "recipient_address" : "Empfängeradresse",
+
+  "extra_id" : "Zusätzliche ID:",
+  "destination_tag" : "Ziel-Tag:",
+  "memo" : "Memo:"
 }

res/values/strings_en.arb

@@ -89,7 +89,7 @@
   "trade_is_powered_by" : "This trade is powered by ${provider}",
   "copy_address" : "Copy Address",
   "exchange_result_confirm" : "By pressing confirm, you will be sending ${fetchingLabel} ${from} from your wallet called ${walletName} to the address shown below. Or you can send from your external wallet to the below address/QR code.\n\nPlease press confirm to continue or go back to change the amounts.",
-  "exchange_result_description" : "Please send ${fetchingLabel} ${from} to the address shown below.",
+  "exchange_result_description" : "Please send ${fetchingLabel} ${from} to the address shown on the next page.",
   "exchange_result_write_down_ID" : "*Please copy or write down your ID shown above.",
   "confirm" : "Confirm",
   "confirm_sending" : "Confirm sending",
@@ -435,5 +435,9 @@
   "note_tap_to_change" : "Note (tap to change)",
   "transaction_key" : "Transaction Key",
   "confirmations" : "Confirmations",
-  "recipient_address" : "Recipient address"
+  "recipient_address" : "Recipient address",
+
+  "extra_id" : "Extra ID:",
+  "destination_tag" : "Destination tag:",
+  "memo" : "Memo:"
 }

res/values/strings_es.arb

@@ -89,7 +89,7 @@
   "trade_is_powered_by" : "Este comercio es impulsado por ${provider}",
   "copy_address" : "Copiar dirección ",
   "exchange_result_confirm" : "Al presionar confirmar, enviará ${fetchingLabel} ${from} desde su billetera llamada ${walletName} a la dirección que se muestra a continuación. O puede enviar desde su billetera externa a la siguiente dirección / código QR anterior.\n\nPresione confirmar para continuar o regrese para cambiar los montos.",
-  "exchange_result_description" : "Envíe ${fetchingLabel} ${from} a la dirección que se muestra a continuación.",
+  "exchange_result_description" : "Envíe ${fetchingLabel} ${from} a la dirección que se muestra en la página siguiente.",
   "exchange_result_write_down_ID" : "*Copie o escriba su identificación que se muestra arriba.",
   "confirm" : "Confirmar",
   "confirm_sending" : "Confirmar envío",
@@ -435,5 +435,9 @@
   "note_tap_to_change" : "Nota (toque para cambiar)",
   "transaction_key" : "Clave de transacción",
   "confirmations" : "Confirmaciones",
-  "recipient_address" : "Dirección del receptor"
+  "recipient_address" : "Dirección del receptor",
+
+  "extra_id" : "ID adicional:",
+  "destination_tag" : "Etiqueta de destino:",
+  "memo" : "Memorándum:"
 }

res/values/strings_hi.arb

@@ -89,7 +89,7 @@
   "trade_is_powered_by" : "यह व्यापार द्वारा संचालित है ${provider}",
   "copy_address" : "पता कॉपी करें",
   "exchange_result_confirm" : "पुष्टि दबाकर, आप भेज रहे होंगे ${fetchingLabel} ${from} अपने बटुए से ${walletName} नीचे दिखाए गए पते पर। या आप अपने बाहरी वॉलेट से नीचे के पते पर भेज सकते हैं / क्यूआर कोड पर भेज सकते हैं।\n\nकृपया जारी रखने या राशि बदलने के लिए वापस जाने के लिए पुष्टि करें दबाएं.",
-  "exchange_result_description" : "कृपया भेजें ${fetchingLabel} ${from} नीचे दिखाए गए पते पर",
+  "exchange_result_description" : "कृपया भेजें ${fetchingLabel} ${from} अगले पृष्ठ पर दिखाए गए पते पर",
   "exchange_result_write_down_ID" : "*कृपया ऊपर दिखाए गए अपने ID को कॉपी या लिख लें.",
   "confirm" : "की पुष्टि करें",
   "confirm_sending" : "भेजने की पुष्टि करें",
@@ -435,5 +435,9 @@
   "note_tap_to_change" : "नोट (टैप टू चेंज)",
   "transaction_key" : "लेन-देन की",
   "confirmations" : "पुष्टिकरण",
-  "recipient_address" : "प्राप्तकर्ता का पता"
+  "recipient_address" : "प्राप्तकर्ता का पता",
+
+  "extra_id" : "अतिरिक्त आईडी:",
+  "destination_tag" : "गंतव्य टैग:",
+  "memo" : "ज्ञापन:"
 }

res/values/strings_ja.arb

@@ -89,7 +89,7 @@
   "trade_is_powered_by" : "この取引は ${provider}",
   "copy_address" : "住所をコピー",
   "exchange_result_confirm" : "確認を押すと、送信されます ${fetchingLabel} ${from} と呼ばれるあなたの財布から ${walletName} 下記の住所へ。 または、外部ウォレットから以下のアドレスに送信することもできます/ QRコードに送信できます.\n\n確認を押して続行するか、戻って金額を変更してください.",
-  "exchange_result_description" : "送信してください ${fetchingLabel} ${from} 下記の住所へ.",
+  "exchange_result_description" : "送信してください ${fetchingLabel} ${from} 次のページに表示されているアドレスに.",
   "exchange_result_write_down_ID" : "*上記のIDをコピーまたは書き留めてください.",
   "confirm" : "確認する",
   "confirm_sending" : "送信を確認",
@@ -435,5 +435,9 @@
   "note_tap_to_change" : "注（タップして変更）",
   "transaction_key" : "トランザクションキー",
   "confirmations" : "確認",
-  "recipient_address" : "受信者のアドレス"
+  "recipient_address" : "受信者のアドレス",
+
+  "extra_id" : "追加ID:",
+  "destination_tag" : "宛先タグ:",
+  "memo" : "メモ:"
 }

res/values/strings_ko.arb

@@ -89,7 +89,7 @@
   "trade_is_powered_by" : "이 거래는 ${provider}",
   "copy_address" : "주소 복사",
   "exchange_result_confirm" : "확인을 누르면 전송됩니다 ${fetchingLabel} ${from} 지갑에서 ${walletName} 아래 주소로. 또는 외부 지갑에서 아래 주소로 보낼 수 있습니다 / QR 코드로 보낼 수 있습니다.\n\n확인을 눌러 계속하거나 금액을 변경하려면 돌아가십시오.",
-  "exchange_result_description" : "보내주세요 ${fetchingLabel} ${from} 아래 주소로.",
+  "exchange_result_description" : "보내주세요 ${fetchingLabel} ${from} 다음 페이지에 표시된 주소로.",
   "exchange_result_write_down_ID" : "*위에 표시된 ID를 복사하거나 적어 두십시오.",
   "confirm" : "확인",
   "confirm_sending" : "전송 확인",
@@ -435,5 +435,9 @@
   "note_tap_to_change" : "메모 (변경하려면 탭하세요)",
   "transaction_key" : "거래 키",
   "confirmations" : "확인",
-  "recipient_address" : "받는 사람 주소"
+  "recipient_address" : "받는 사람 주소",
+
+  "extra_id" : "추가 ID:",
+  "destination_tag" : "목적지 태그:",
+  "memo" : "메모:"
 }

res/values/strings_nl.arb

@@ -89,7 +89,7 @@
   "trade_is_powered_by" : "Deze transactie wordt mogelijk gemaakt door ${provider}",
   "copy_address" : "Adres kopiëren",
   "exchange_result_confirm" : "Door op bevestigen te drukken, wordt u verzonden ${fetchingLabel} ${from} uit je portemonnee genoemd ${walletName} naar het onderstaande adres. Of u kunt vanuit uw externe portemonnee naar het onderstaande adres verzenden / QR-code sturen.\n\nDruk op bevestigen om door te gaan of terug te gaan om de bedragen te wijzigen.",
-  "exchange_result_description" : "Zend alstublieft ${fetchingLabel} ${from} naar het onderstaande adres.",
+  "exchange_result_description" : "Zend alstublieft ${fetchingLabel} ${from} naar het adres op de volgende pagina.",
   "exchange_result_write_down_ID" : "*Kopieer of noteer uw hierboven getoonde ID.",
   "confirm" : "Bevestigen",
   "confirm_sending" : "Bevestig verzending",
@@ -435,5 +435,9 @@
   "note_tap_to_change" : "Opmerking (tik om te wijzigen)",
   "transaction_key" : "Transactiesleutel",
   "confirmations" : "Bevestigingen",
-  "recipient_address" : "Adres ontvanger"
+  "recipient_address" : "Adres ontvanger",
+
+  "extra_id" : "Extra ID:",
+  "destination_tag" : "Bestemmingstag:",
+  "memo" : "Memo:"
 }

res/values/strings_pl.arb

@@ -89,7 +89,7 @@
   "trade_is_powered_by" : "Ten handel jest zasilany przez ${provider}",
   "copy_address" : "Skopiuj adress",
   "exchange_result_confirm" : "Naciskając Potwierdź, wyślesz ${fetchingLabel} ${from} z twojego portfela ${walletName} na adres podany poniżej. Lub możesz wysłać z zewnętrznego portfela na poniższy adres / kod QR.\n\nNaciśnij Potwierdź, aby kontynuować lub wróć, aby zmienić kwoty.",
-  "exchange_result_description" : "Proszę wyślij ${fetchingLabel} ${from} na adres podany poniżej.",
+  "exchange_result_description" : "Proszę wyślij ${fetchingLabel} ${from} pod adres podany na następnej stronie.",
   "exchange_result_write_down_ID" : "*Skopiuj lub zanotuj swój identyfikator pokazany powyżej.",
   "confirm" : "Potwierdzać",
   "confirm_sending" : "Potwierdź wysłanie",
@@ -435,5 +435,9 @@
   "note_tap_to_change" : "Notatka (dotknij, aby zmienić)",
   "transaction_key" : "Klucz transakcji",
   "confirmations" : "Potwierdzenia",
-  "recipient_address" : "Adres odbiorcy"
+  "recipient_address" : "Adres odbiorcy",
+
+  "extra_id" : "Dodatkowy ID:",
+  "destination_tag" : "Tag docelowy:",
+  "memo" : "Notatka:"
 }

res/values/strings_pt.arb

@@ -89,7 +89,7 @@
   "trade_is_powered_by" : "Troca realizada por ${provider}",
   "copy_address" : "Copiar endereço",
   "exchange_result_confirm" : "Ao confirmar, você enviará ${fetchingLabel} ${from} da sua carteira  ${walletName} para o endereço mostrado abaixo. Ou você pode enviar de sua carteira externa para o endereço abaixo/código QR acima.\n\nPressione Confirmar para continuar ou volte para alterar os valores.",
-  "exchange_result_description" : "Por favor, envie ${fetchingLabel} ${from} para o endereço mostrado abaixo.",
+  "exchange_result_description" : "Por favor, envie ${fetchingLabel} ${from} para o endereço mostrado na próxima página.",
   "exchange_result_write_down_ID" : "*Copie ou anote seu ID mostrado acima.",
   "confirm" : "Confirmar",
   "confirm_sending" : "Confirmar o envio",
@@ -435,5 +435,9 @@
   "note_tap_to_change" : "Nota (toque para alterar)",
   "transaction_key" : "Chave de transação",
   "confirmations" : "Confirmações",
-  "recipient_address" : "Endereço do destinatário"
+  "recipient_address" : "Endereço do destinatário",
+
+  "extra_id" : "ID extra:",
+  "destination_tag" : "Tag de destino:",
+  "memo" : "Memorando:"
 }

res/values/strings_ru.arb

@@ -89,7 +89,7 @@
   "trade_is_powered_by" : "Сделка выполнена через ${provider}",
   "copy_address" : "Cкопировать адрес",
   "exchange_result_confirm" : "Нажимая подтвердить, вы отправите ${fetchingLabel} ${from} с вашего кошелька ${walletName} на адрес указанный ниже. Или вы можете отправить со своего внешнего кошелька на нижеуказанный адрес/QR-код.\n\nПожалуйста, нажмите подтвердить для продолжения, или вернитесь назад для изменения суммы.",
-  "exchange_result_description" : "Пожалуйста отправьте ${fetchingLabel} ${from} на адрес, указанный ниже.",
+  "exchange_result_description" : "Пожалуйста отправьте ${fetchingLabel} ${from} на адрес, указанный на следующей странице.",
   "exchange_result_write_down_ID" : "*Пожалуйста, скопируйте или запишите ID, указанный выше.",
   "confirm" : "Подтвердить",
   "confirm_sending" : "Подтвердить отправку",
@@ -435,5 +435,9 @@
   "note_tap_to_change" : "Примечание (нажмите для изменения)",
   "transaction_key" : "Ключ транзакции",
   "confirmations" : "Подтверждения",
-  "recipient_address" : "Адрес получателя"
+  "recipient_address" : "Адрес получателя",
+
+  "extra_id" : "Дополнительный ID:",
+  "destination_tag" : "Целевой тег:",
+  "memo" : "Памятка:"
 }

res/values/strings_uk.arb

@@ -89,7 +89,7 @@
   "trade_is_powered_by" : "Операція виконана через ${provider}",
   "copy_address" : "Cкопіювати адресу",
   "exchange_result_confirm" : "Натиснувши підтвердити, ви відправите ${fetchingLabel} ${from} з вашого гаманця ${walletName} на адресу вказану нижче. Або ви можете відправити зі свого зовнішнього гаманця на нижчевказану адресу/QR-код.\n\nБудь ласка, натисніть підтвердити для продовження або поверніться назад щоб змінити суму.",
-  "exchange_result_description" : "Будь ласка, відправте ${fetchingLabel} ${from} на адресу, вказану нижче.",
+  "exchange_result_description" : "Будь ласка, відправте ${fetchingLabel} ${from} на адресу, вказану на наступній сторінці.",
   "exchange_result_write_down_ID" : "*Будь ласка, скопіюйте або запишіть ID, вказаний вище.",
   "confirm" : "Підтвердити",
   "confirm_sending" : "Підтвердити відправлення",
@@ -435,5 +435,9 @@
   "note_tap_to_change" : "Примітка (натисніть для зміни)",
   "transaction_key" : "Ключ транзакції",
   "confirmations" : "Підтвердження",
-  "recipient_address" : "Адреса одержувача"
+  "recipient_address" : "Адреса одержувача",
+
+  "extra_id" : "Додатковий ID:",
+  "destination_tag" : "Тег призначення:",
+  "memo" : "Пам’ятка:"
 }

res/values/strings_zh.arb

@@ -89,7 +89,7 @@
   "trade_is_powered_by" : "该交易由 ${provider}",
   "copy_address" : "复制地址",
   "exchange_result_confirm" : "点击确认 您将发送 ${fetchingLabel} ${from} 从你的钱包里 ${walletName} 到下面顯示的地址。 或者您可以從外部錢包發送到以下地址/ QR码。\n\n请按确认继续或返回以更改金额",
-  "exchange_result_description" : "请发送 ${fetchingLabel} ${from} 到下面顯示的地址.",
+  "exchange_result_description" : "请发送 ${fetchingLabel} ${from} 到下一頁顯示的地址.",
   "exchange_result_write_down_ID" : "*请复制或写下您上面显示的ID.",
   "confirm" : "确认",
   "confirm_sending" : "确认发送",
@@ -435,5 +435,9 @@
   "note_tap_to_change" : "注意（輕按即可更改）",
   "transaction_key" : "交易密碼",
   "confirmations" : "確認書",
-  "recipient_address" : "收件人地址"
+  "recipient_address" : "收件人地址",
+
+  "extra_id" : "額外編號:",
+  "destination_tag" : "目標標籤:",
+  "memo" : "備忘錄:"
 }