diff --git a/lib/src/screens/setup_2fa/setup_2fa_qr_page.dart b/lib/src/screens/setup_2fa/setup_2fa_qr_page.dart index 82a079b39..e9ab850af 100644 --- a/lib/src/screens/setup_2fa/setup_2fa_qr_page.dart +++ b/lib/src/screens/setup_2fa/setup_2fa_qr_page.dart @@ -14,7 +14,6 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:qr_flutter/qr_flutter.dart' as qr; - class Setup2FAQRPage extends BasePage { Setup2FAQRPage({required this.setup2FAViewModel}); @@ -25,7 +24,6 @@ class Setup2FAQRPage extends BasePage { @override Widget body(BuildContext context) { - final copyImage = Image.asset( 'assets/images/copy_content.png', height: 12, @@ -126,16 +124,69 @@ class Setup2FAQRPage extends BasePage { ), SizedBox(height: 8), StandardListSeparator(), + SizedBox(height: 13), + Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + Expanded( + flex: 2, + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text( + S.current.totp_auth_url, + style: TextStyle( + fontSize: 12, + fontWeight: FontWeight.w500, + color: Palette.darkGray, + height: 1.8333, + ), + ), + SizedBox(height: 8), + Text( + '${setup2FAViewModel.totpVersionOneLink}', + style: TextStyle( + fontSize: 16, + fontWeight: FontWeight.w700, + height: 1.375, + ), + maxLines: 1, + overflow: TextOverflow.ellipsis, + ), + ], + ), + ), + SizedBox(width: 8), + Container( + width: 32, + height: 32, + child: InkWell( + onTap: () { + ClipboardUtil.setSensitiveDataToClipboard( + ClipboardData(text: '${setup2FAViewModel.totpVersionOneLink}')); + showBar(context, S.of(context).copied_to_clipboard); + }, + child: Container( + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(6), + color: Color(0xFFF2F0FA), + ), + child: copyImage, + ), + ), + ) + ], + ), + SizedBox(height: 8), + StandardListSeparator(), Spacer(), PrimaryButton( onPressed: () { - Navigator.of(context).pushReplacementNamed( - Routes.totpAuthCodePage, + Navigator.of(context).pushReplacementNamed(Routes.totpAuthCodePage, arguments: TotpAuthArgumentsModel( isForSetup: true, - ) - - ); + )); }, text: S.current.continue_text, color: Theme.of(context).primaryColor, diff --git a/res/values/strings_ar.arb b/res/values/strings_ar.arb index 7c7b0535b..b10dfbe8e 100644 --- a/res/values/strings_ar.arb +++ b/res/values/strings_ar.arb @@ -688,5 +688,6 @@ "onramper_option_description": "شراء بسرعة التشفير مع العديد من طرق الدفع. متوفر في معظم البلدان. ينتشر وتختلف الرسوم.", "default_buy_provider": "مزود شراء الافتراضي", "ask_each_time": "اسأل في كل مرة", - "buy_provider_unavailable": "مزود حاليا غير متوفر." -} \ No newline at end of file + "buy_provider_unavailable": "مزود حاليا غير متوفر.", + "totp_auth_url": " TOTP ﺔﻗﺩﺎﺼﻤﻟ URL ﻥﺍﻮﻨﻋ" +} diff --git a/res/values/strings_bg.arb b/res/values/strings_bg.arb index 9f4c21c44..828af2102 100644 --- a/res/values/strings_bg.arb +++ b/res/values/strings_bg.arb @@ -684,5 +684,6 @@ "onramper_option_description": "Бързо купувайте криптовалута с много методи за плащане. Предлага се в повечето страни. Разпространенията и таксите варират.", "default_buy_provider": "Доставчик по подразбиране купува", "ask_each_time": "Питайте всеки път", - "buy_provider_unavailable": "Понастоящем доставчик не е наличен." -} \ No newline at end of file + "buy_provider_unavailable": "Понастоящем доставчик не е наличен.", + "totp_auth_url": "TOTP AUTH URL" +} diff --git a/res/values/strings_cs.arb b/res/values/strings_cs.arb index 82d0fd9ed..ea4dc1856 100644 --- a/res/values/strings_cs.arb +++ b/res/values/strings_cs.arb @@ -684,5 +684,6 @@ "onramper_option_description": "Rychle si koupte krypto s mnoha metodami plateb. K dispozici ve většině zemí. Rozpětí a poplatky se liší.", "default_buy_provider": "Výchozí poskytovatel nákupu", "ask_each_time": "Zeptejte se pokaždé", - "buy_provider_unavailable": "Poskytovatel aktuálně nedostupný." -} \ No newline at end of file + "buy_provider_unavailable": "Poskytovatel aktuálně nedostupný.", + "totp_auth_url": "URL AUTH TOTP" +} diff --git a/res/values/strings_de.arb b/res/values/strings_de.arb index e5bb7ce51..09538ccc0 100644 --- a/res/values/strings_de.arb +++ b/res/values/strings_de.arb @@ -692,5 +692,6 @@ "onramper_option_description": "Kaufen Sie schnell Krypto mit vielen Zahlungsmethoden. In den meisten Ländern erhältlich. Spreads und Gebühren variieren.", "default_buy_provider": "Standard-Kaufanbieter", "ask_each_time": "Jedes Mal fragen", - "buy_provider_unavailable": "Anbieter derzeit nicht verfügbar." -} \ No newline at end of file + "buy_provider_unavailable": "Anbieter derzeit nicht verfügbar.", + "totp_auth_url": "TOTP-Auth-URL" +} diff --git a/res/values/strings_en.arb b/res/values/strings_en.arb index 8cf6e2acb..99ba22b18 100644 --- a/res/values/strings_en.arb +++ b/res/values/strings_en.arb @@ -693,5 +693,6 @@ "default_buy_provider": "Default Buy Provider", "ask_each_time": "Ask each time", "robinhood_option_description": "Buy and transfer instantly using your debit card, bank account, or Robinhood balance. USA only.", - "buy_provider_unavailable": "Provider currently unavailable." -} \ No newline at end of file + "buy_provider_unavailable": "Provider currently unavailable.", + "totp_auth_url": "TOTP AUTH URL" +} diff --git a/res/values/strings_es.arb b/res/values/strings_es.arb index d84b21b94..a6175c6c0 100644 --- a/res/values/strings_es.arb +++ b/res/values/strings_es.arb @@ -692,5 +692,6 @@ "onramper_option_description": "Compre rápidamente cripto con muchos métodos de pago. Disponible en la mayoría de los países. Los diferenciales y las tarifas varían.", "default_buy_provider": "Proveedor de compra predeterminado", "ask_each_time": "Pregunta cada vez", - "buy_provider_unavailable": "Proveedor actualmente no disponible." -} \ No newline at end of file + "buy_provider_unavailable": "Proveedor actualmente no disponible.", + "totp_auth_url": "URL de autenticación TOTP" +} diff --git a/res/values/strings_fr.arb b/res/values/strings_fr.arb index 2daea4733..f659f0b14 100644 --- a/res/values/strings_fr.arb +++ b/res/values/strings_fr.arb @@ -692,5 +692,6 @@ "onramper_option_description": "Achetez rapidement la crypto avec de nombreux méthodes de paiement. Disponible dans la plupart des pays. Les écarts et les frais varient.", "default_buy_provider": "Fournisseur d'achat par défaut", "ask_each_time": "Demandez à chaque fois", - "buy_provider_unavailable": "Fournisseur actuellement indisponible." -} \ No newline at end of file + "buy_provider_unavailable": "Fournisseur actuellement indisponible.", + "totp_auth_url": "URL D'AUTORISATION TOTP" +} diff --git a/res/values/strings_ha.arb b/res/values/strings_ha.arb index 666664ec2..2b55ffd2a 100644 --- a/res/values/strings_ha.arb +++ b/res/values/strings_ha.arb @@ -670,5 +670,6 @@ "onramper_option_description": "Da sauri sayi Crypto tare da hanyoyin biyan kuɗi da yawa. Akwai a yawancin ƙasashe. Yaduwa da kudade sun bambanta.", "default_buy_provider": "Tsohuwar Siyarwa", "ask_each_time": "Tambaya kowane lokaci", - "buy_provider_unavailable": "Mai ba da kyauta a halin yanzu babu." -} \ No newline at end of file + "buy_provider_unavailable": "Mai ba da kyauta a halin yanzu babu.", + "totp_auth_url": "TOTP AUTH URL" +} diff --git a/res/values/strings_hi.arb b/res/values/strings_hi.arb index 9504baf36..69f37ab83 100644 --- a/res/values/strings_hi.arb +++ b/res/values/strings_hi.arb @@ -692,5 +692,6 @@ "onramper_option_description": "जल्दी से कई भुगतान विधियों के साथ क्रिप्टो खरीदें। अधिकांश देशों में उपलब्ध है। फैलता है और फीस अलग -अलग होती है।", "default_buy_provider": "डिफ़ॉल्ट खरीद प्रदाता", "ask_each_time": "हर बार पूछें", - "buy_provider_unavailable": "वर्तमान में प्रदाता अनुपलब्ध है।" -} \ No newline at end of file + "buy_provider_unavailable": "वर्तमान में प्रदाता अनुपलब्ध है।", + "totp_auth_url": "TOTP प्रामाणिक यूआरएल" +} diff --git a/res/values/strings_hr.arb b/res/values/strings_hr.arb index 08549439a..3c4299092 100644 --- a/res/values/strings_hr.arb +++ b/res/values/strings_hr.arb @@ -692,5 +692,6 @@ "onramper_option_description": "Brzo kupite kriptovalute s mnogim načinima plaćanja. Dostupno u većini zemalja. Širenja i naknade variraju.", "default_buy_provider": "Zadani davatelj kupnje", "ask_each_time": "Pitajte svaki put", - "buy_provider_unavailable": "Davatelj trenutno nije dostupan." -} \ No newline at end of file + "buy_provider_unavailable": "Davatelj trenutno nije dostupan.", + "totp_auth_url": "TOTP AUTH URL" +} diff --git a/res/values/strings_id.arb b/res/values/strings_id.arb index 031777aea..a5b2e3ffa 100644 --- a/res/values/strings_id.arb +++ b/res/values/strings_id.arb @@ -680,5 +680,6 @@ "onramper_option_description": "Beli crypto dengan cepat dengan banyak metode pembayaran. Tersedia di sebagian besar negara. Spread dan biaya bervariasi.", "default_buy_provider": "Penyedia beli default", "ask_each_time": "Tanyakan setiap kali", - "buy_provider_unavailable": "Penyedia saat ini tidak tersedia." -} \ No newline at end of file + "buy_provider_unavailable": "Penyedia saat ini tidak tersedia.", + "totp_auth_url": "URL Otentikasi TOTP" +} diff --git a/res/values/strings_it.arb b/res/values/strings_it.arb index b14531b75..98c13aa2d 100644 --- a/res/values/strings_it.arb +++ b/res/values/strings_it.arb @@ -692,5 +692,6 @@ "onramper_option_description": "Acquista rapidamente la criptovaluta con molti metodi di pagamento. Disponibile nella maggior parte dei paesi. Gli spread e le commissioni variano.", "default_buy_provider": "Provider di acquisto predefinito", "ask_each_time": "Chiedi ogni volta", - "buy_provider_unavailable": "Provider attualmente non disponibile." -} \ No newline at end of file + "buy_provider_unavailable": "Provider attualmente non disponibile.", + "totp_auth_url": "URL DI AUT. TOTP" +} diff --git a/res/values/strings_ja.arb b/res/values/strings_ja.arb index baf9b8a6d..f5bea4b58 100644 --- a/res/values/strings_ja.arb +++ b/res/values/strings_ja.arb @@ -692,5 +692,6 @@ "onramper_option_description": "多くの支払い方法で暗号をすばやく購入してください。ほとんどの国で利用可能です。スプレッドと料金は異なります。", "default_buy_provider": "デフォルトの購入プロバイダー", "ask_each_time": "毎回尋ねてください", - "buy_provider_unavailable": "現在、プロバイダーは利用できません。" -} \ No newline at end of file + "buy_provider_unavailable": "現在、プロバイダーは利用できません。", + "totp_auth_url": "TOTP認証URL" +} diff --git a/res/values/strings_ko.arb b/res/values/strings_ko.arb index 3b9ed1e74..79455ff92 100644 --- a/res/values/strings_ko.arb +++ b/res/values/strings_ko.arb @@ -692,5 +692,6 @@ "onramper_option_description": "많은 결제 방법으로 암호화를 신속하게 구입하십시오. 대부분의 국가에서 사용할 수 있습니다. 스프레드와 수수료는 다양합니다.", "default_buy_provider": "기본 구매 제공자", "ask_each_time": "매번 물어보십시오", - "buy_provider_unavailable": "제공자는 현재 사용할 수 없습니다." -} \ No newline at end of file + "buy_provider_unavailable": "제공자는 현재 사용할 수 없습니다.", + "totp_auth_url": "TOTP 인증 URL" +} diff --git a/res/values/strings_my.arb b/res/values/strings_my.arb index 04d2f58ef..4ea13bc27 100644 --- a/res/values/strings_my.arb +++ b/res/values/strings_my.arb @@ -690,5 +690,6 @@ "onramper_option_description": "ငွေပေးချေမှုနည်းလမ်းများစွာဖြင့် Crypto ကိုလျင်မြန်စွာ 0 ယ်ပါ။ နိုင်ငံအများစုတွင်ရရှိနိုင်ပါသည်။ ဖြန့်ဖြူးနှင့်အခကြေးငွေကွဲပြားခြားနားသည်။", "default_buy_provider": "Default Provider ကိုဝယ်ပါ", "ask_each_time": "တစ်ခုချင်းစီကိုအချိန်မေးပါ", - "buy_provider_unavailable": "လက်ရှိတွင်လက်ရှိမရနိုင်ပါ။" -} \ No newline at end of file + "buy_provider_unavailable": "လက်ရှိတွင်လက်ရှိမရနိုင်ပါ။", + "totp_auth_url": "TOTP AUTH URL" +} diff --git a/res/values/strings_nl.arb b/res/values/strings_nl.arb index 676653dcd..99a469945 100644 --- a/res/values/strings_nl.arb +++ b/res/values/strings_nl.arb @@ -692,5 +692,6 @@ "onramper_option_description": "Koop snel crypto met veel betaalmethoden. Beschikbaar in de meeste landen. Spreads en vergoedingen variëren.", "default_buy_provider": "Standaard Koopprovider", "ask_each_time": "Vraag het elke keer", - "buy_provider_unavailable": "Provider momenteel niet beschikbaar." -} \ No newline at end of file + "buy_provider_unavailable": "Provider momenteel niet beschikbaar.", + "totp_auth_url": "TOTP AUTH-URL" +} diff --git a/res/values/strings_pl.arb b/res/values/strings_pl.arb index cae3d0075..5d32ee12c 100644 --- a/res/values/strings_pl.arb +++ b/res/values/strings_pl.arb @@ -692,5 +692,6 @@ "onramper_option_description": "Szybko kup kryptowaluty z wieloma metodami płatności. Dostępne w większości krajów. Spready i opłaty różnią się.", "default_buy_provider": "Domyślny dostawca zakupu", "ask_each_time": "Zapytaj za każdym razem", - "buy_provider_unavailable": "Dostawca obecnie niedostępny." -} \ No newline at end of file + "buy_provider_unavailable": "Dostawca obecnie niedostępny.", + "totp_auth_url": "Adres URL TOTP AUTH" +} diff --git a/res/values/strings_pt.arb b/res/values/strings_pt.arb index 46c62c590..ca46a26e7 100644 --- a/res/values/strings_pt.arb +++ b/res/values/strings_pt.arb @@ -691,5 +691,6 @@ "onramper_option_description": "Compre rapidamente criptografia com muitos métodos de pagamento. Disponível na maioria dos países. Os spreads e taxas variam.", "default_buy_provider": "Provedor de compra padrão", "ask_each_time": "Pergunte cada vez", - "buy_provider_unavailable": "Provedor atualmente indisponível." -} \ No newline at end of file + "buy_provider_unavailable": "Provedor atualmente indisponível.", + "totp_auth_url": "URL de autenticação TOTP" +} diff --git a/res/values/strings_ru.arb b/res/values/strings_ru.arb index 523b4c77e..fb3883338 100644 --- a/res/values/strings_ru.arb +++ b/res/values/strings_ru.arb @@ -692,5 +692,6 @@ "onramper_option_description": "Быстро купите крипто со многими способами оплаты. Доступно в большинстве стран. Спреды и сборы различаются.", "default_buy_provider": "По умолчанию поставщик покупки", "ask_each_time": "Спросите каждый раз", - "buy_provider_unavailable": "Поставщик в настоящее время недоступен." -} \ No newline at end of file + "buy_provider_unavailable": "Поставщик в настоящее время недоступен.", + "totp_auth_url": "URL-адрес TOTP-АВТОРИЗАЦИИ" +} diff --git a/res/values/strings_th.arb b/res/values/strings_th.arb index 68c13dd2d..0e31518eb 100644 --- a/res/values/strings_th.arb +++ b/res/values/strings_th.arb @@ -690,5 +690,6 @@ "onramper_option_description": "ซื้อ crypto อย่างรวดเร็วด้วยวิธีการชำระเงินจำนวนมาก มีให้บริการในประเทศส่วนใหญ่ สเปรดและค่าธรรมเนียมแตกต่างกันไป", "default_buy_provider": "ผู้ให้บริการซื้อเริ่มต้น", "ask_each_time": "ถามทุกครั้ง", - "buy_provider_unavailable": "ผู้ให้บริการไม่สามารถใช้งานได้ในปัจจุบัน" -} \ No newline at end of file + "buy_provider_unavailable": "ผู้ให้บริการไม่สามารถใช้งานได้ในปัจจุบัน", + "totp_auth_url": "URL การตรวจสอบสิทธิ์ TOTP" +} diff --git a/res/values/strings_tr.arb b/res/values/strings_tr.arb index 2694bb1bc..16ed18b96 100644 --- a/res/values/strings_tr.arb +++ b/res/values/strings_tr.arb @@ -690,5 +690,6 @@ "onramper_option_description": "Birçok ödeme yöntemi ile hızlı bir şekilde kripto satın alın. Çoğu ülkede mevcuttur. Forma ve ücretler değişir.", "default_buy_provider": "Varsayılan Satın Alma Sağlayıcısı", "ask_each_time": "Her seferinde sor", - "buy_provider_unavailable": "Sağlayıcı şu anda kullanılamıyor." -} \ No newline at end of file + "buy_provider_unavailable": "Sağlayıcı şu anda kullanılamıyor.", + "totp_auth_url": "TOTP YETKİ URL'si" +} diff --git a/res/values/strings_uk.arb b/res/values/strings_uk.arb index 38fe226b1..c9943dd3a 100644 --- a/res/values/strings_uk.arb +++ b/res/values/strings_uk.arb @@ -692,5 +692,6 @@ "onramper_option_description": "Швидко купуйте криптовалюту з багатьма методами оплати. Доступний у більшості країн. Поширення та збори різняться.", "default_buy_provider": "Постачальник покупки за замовчуванням", "ask_each_time": "Запитайте кожен раз", - "buy_provider_unavailable": "В даний час постачальник недоступний." -} \ No newline at end of file + "buy_provider_unavailable": "В даний час постачальник недоступний.", + "totp_auth_url": "TOTP AUTH URL" +} diff --git a/res/values/strings_ur.arb b/res/values/strings_ur.arb index 1ecdb5c0e..47c96d9fb 100644 --- a/res/values/strings_ur.arb +++ b/res/values/strings_ur.arb @@ -684,5 +684,6 @@ "onramper_option_description": "ادائیگی کے بہت سے طریقوں سے جلدی سے کرپٹو خریدیں۔ زیادہ تر ممالک میں دستیاب ہے۔ پھیلاؤ اور فیس مختلف ہوتی ہے۔", "default_buy_provider": "پہلے سے طے شدہ خریدنے والا", "ask_each_time": "ہر بار پوچھیں", - "buy_provider_unavailable": "فراہم کنندہ فی الحال دستیاب نہیں ہے۔" -} \ No newline at end of file + "buy_provider_unavailable": "فراہم کنندہ فی الحال دستیاب نہیں ہے۔", + "totp_auth_url": "TOTP AUTH URL" +} diff --git a/res/values/strings_yo.arb b/res/values/strings_yo.arb index 62909f128..ec84589da 100644 --- a/res/values/strings_yo.arb +++ b/res/values/strings_yo.arb @@ -686,5 +686,6 @@ "onramper_option_description": "Ni kiakia Ra Crypto pẹlu ọpọlọpọ awọn ọna isanwo. Wa ni ọpọlọpọ awọn orilẹ-ede. Itankale ati awọn idiyele yatọ.", "default_buy_provider": "Aiyipada Ra Olupese", "ask_each_time": "Beere lọwọ kọọkan", - "buy_provider_unavailable": "Olupese lọwọlọwọ ko si." -} \ No newline at end of file + "buy_provider_unavailable": "Olupese lọwọlọwọ ko si.", + "totp_auth_url": "TOTP AUTH URL" +} diff --git a/res/values/strings_zh.arb b/res/values/strings_zh.arb index 24295e0ca..c606d4135 100644 --- a/res/values/strings_zh.arb +++ b/res/values/strings_zh.arb @@ -691,5 +691,6 @@ "onramper_option_description": "快速使用许多付款方式购买加密货币。在大多数国家 /地区可用。利差和费用各不相同。", "default_buy_provider": "默认购买提供商", "ask_each_time": "每次问", - "buy_provider_unavailable": "提供者目前不可用。" -} \ No newline at end of file + "buy_provider_unavailable": "提供者目前不可用。", + "totp_auth_url": "TOTP 授权 URL" +}