diff --git a/assets/faq/faq_de.json b/assets/faq/faq_de.json index 5caeaf422..330078734 100644 --- a/assets/faq/faq_de.json +++ b/assets/faq/faq_de.json @@ -53,6 +53,6 @@ }, { "question" : "Wie kontaktiere ich den Cake Wallet-Support?", - "answer" : "Senden Sie eine E-Mail an support@cakewallet.io, schließen Sie sich dem Telegramm unter @cake_wallet an oder twittern Sie @CakeWalletXMR!\n" + "answer" : "Senden Sie eine E-Mail an support@cakewallet.io, schließen Sie sich dem Telegramm unter @cakewallet_bot an oder twittern Sie @CakeWalletXMR!\n" } ] \ No newline at end of file diff --git a/assets/faq/faq_en.json b/assets/faq/faq_en.json index 8624b6ee9..5edb2eb8a 100644 --- a/assets/faq/faq_en.json +++ b/assets/faq/faq_en.json @@ -53,6 +53,6 @@ }, { "question" : "How do I contact Cake Wallet support?", - "answer" : "Email support@cakewallet.io, join the Telegram at @cake_wallet, or tweet @CakeWalletXMR!\n" + "answer" : "Email support@cakewallet.io, join the Telegram at @cakewallet_bot, or tweet @CakeWalletXMR!\n" } ] \ No newline at end of file diff --git a/assets/faq/faq_es.json b/assets/faq/faq_es.json index 438592839..5eed60ae2 100644 --- a/assets/faq/faq_es.json +++ b/assets/faq/faq_es.json @@ -53,6 +53,6 @@ }, { "question" : "¿Cómo contacto al soporte de Cake Wallet?", - "answer" : "¡Envíe un correo electrónico a support@cakewallet.io, únase al Telegram en @cake_wallet o envíe un tweet a @CakeWalletXMR!\n" + "answer" : "¡Envíe un correo electrónico a support@cakewallet.io, únase al Telegram en @cakewallet_bot o envíe un tweet a @CakeWalletXMR!\n" } ] \ No newline at end of file diff --git a/assets/faq/faq_hi.json b/assets/faq/faq_hi.json index e9b87083d..b8a4ad2f9 100644 --- a/assets/faq/faq_hi.json +++ b/assets/faq/faq_hi.json @@ -53,6 +53,6 @@ }, { "question" : "मैं केक वॉलेट से कैसे संपर्क करूं?", - "answer" : "ईमेल support@cakewallet.io, @cake_wallet पर टेलीग्राम में शामिल हों, या @CakeWalletXMR पर ट्वीट करें!\n" + "answer" : "ईमेल support@cakewallet.io, @cakewallet_bot पर टेलीग्राम में शामिल हों, या @CakeWalletXMR पर ट्वीट करें!\n" } ] \ No newline at end of file diff --git a/assets/faq/faq_ja.json b/assets/faq/faq_ja.json index cdae6aea6..cb08c8da7 100644 --- a/assets/faq/faq_ja.json +++ b/assets/faq/faq_ja.json @@ -53,6 +53,6 @@ }, { "question" : "Cake Walletサポートに連絡するにはどうすればよいですか？", - "answer" : "support@cakewallet.ioにメールを送信するか、@ cake_walletで電報に参加するか、@ CakeWalletXMRにツイートしてください。\n" + "answer" : "support@cakewallet.ioにメールを送信するか、@cakewallet_botで電報に参加するか、@CakeWalletXMRにツイートしてください。\n" } ] \ No newline at end of file diff --git a/assets/faq/faq_ko.json b/assets/faq/faq_ko.json index 1e2c39b9f..b41c84e06 100644 --- a/assets/faq/faq_ko.json +++ b/assets/faq/faq_ko.json @@ -53,6 +53,6 @@ }, { "question" : "Cake Wallet 지원팀에 연락하려면 어떻게해야합니까?", - "answer" : "support@cakewallet.io로 이메일을 보내거나 @cake_wallet에서 전보에 가입하거나 @CakeWalletXMR을 트윗하십시오!\n" + "answer" : "support@cakewallet.io로 이메일을 보내거나 @cakewallet_bot에서 전보에 가입하거나 @CakeWalletXMR을 트윗하십시오!\n" } ] \ No newline at end of file diff --git a/assets/faq/faq_nl.json b/assets/faq/faq_nl.json index a080a9bbc..6d42fc041 100644 --- a/assets/faq/faq_nl.json +++ b/assets/faq/faq_nl.json @@ -53,6 +53,6 @@ }, { "question" : "Hoe neem ik contact op met Cake Wallet-ondersteuning?", - "answer" : "E-mail support@cakewallet.io, word lid van het Telegram op @cake_wallet of tweet @CakeWalletXMR!\n" + "answer" : "E-mail support@cakewallet.io, word lid van het Telegram op @cakewallet_bot of tweet @CakeWalletXMR!\n" } ] \ No newline at end of file diff --git a/assets/faq/faq_pl.json b/assets/faq/faq_pl.json index a3af8deb6..1bcc3eacc 100644 --- a/assets/faq/faq_pl.json +++ b/assets/faq/faq_pl.json @@ -53,6 +53,6 @@ }, { "question" : "Jak skontaktować się z obsługą Cake Wallet?", - "answer" : "Wyślij e-mail na adres support@cakewallet.io, dołącz do telegramu na @cake_wallet lub tweet @CakeWalletXMR!\n" + "answer" : "Wyślij e-mail na adres support@cakewallet.io, dołącz do telegramu na @cakewallet_bot lub tweet @CakeWalletXMR!\n" } ] \ No newline at end of file diff --git a/assets/faq/faq_pt.json b/assets/faq/faq_pt.json index 210ec5896..898d15d49 100644 --- a/assets/faq/faq_pt.json +++ b/assets/faq/faq_pt.json @@ -53,6 +53,6 @@ }, { "question" : "Como entro em contato com o suporte da Cake Wallet?", - "answer" : "Envie um e-mail para support@cakewallet.io, participe do Telegram em @cake_wallet ou envie um tweet para @CakeWalletXMR!\n" + "answer" : "Envie um e-mail para support@cakewallet.io, participe do Telegram em @cakewallet_bot ou envie um tweet para @CakeWalletXMR!\n" } ] \ No newline at end of file diff --git a/assets/faq/faq_ru.json b/assets/faq/faq_ru.json index 77b1bf53e..e4b5c2032 100644 --- a/assets/faq/faq_ru.json +++ b/assets/faq/faq_ru.json @@ -53,6 +53,6 @@ }, { "question" : "Как мне связаться со службой поддержки Cake Wallet?", - "answer" : "По электронной почте support@cakewallet.io, присоединитесь к Telegram по адресу @cake_wallet или отправьте твит @CakeWalletXMR!\n" + "answer" : "По электронной почте support@cakewallet.io, присоединитесь к Telegram по адресу @cakewallet_bot или отправьте твит @CakeWalletXMR!\n" } ] \ No newline at end of file diff --git a/assets/faq/faq_zh.json b/assets/faq/faq_zh.json index 1f9d3242a..8c1ca0e66 100644 --- a/assets/faq/faq_zh.json +++ b/assets/faq/faq_zh.json @@ -53,6 +53,6 @@ }, { "question" : "如何联系蛋糕钱包支持？", - "answer" : "电子邮件support@cakewallet.io，通过@cake_wallet加入电报，或在@CakeWalletXMR上发布推文！\n" + "answer" : "电子邮件support@cakewallet.io，通过@cakewallet_bot加入电报，或在@CakeWalletXMR上发布推文！\n" } ] \ No newline at end of file diff --git a/lib/src/screens/faq/faq_page.dart b/lib/src/screens/faq/faq_page.dart index 78a5ba62a..182e20a92 100644 --- a/lib/src/screens/faq/faq_page.dart +++ b/lib/src/screens/faq/faq_page.dart @@ -7,33 +7,38 @@ import 'package:cake_wallet/src/stores/settings/settings_store.dart'; import 'package:cake_wallet/src/screens/base_page.dart'; class FaqPage extends BasePage { - @override String get title => S.current.faq; @override Widget body(BuildContext context) { return FutureBuilder( builder: (context, snapshot) { - final faqItems = (json.decode(snapshot.data.toString()) - as List>) ?? - >[]; + final faqItems = jsonDecode(snapshot.data.toString()) as List; return ListView.separated( itemBuilder: (BuildContext context, int index) { - final itemTitle = faqItems[index]["question"]; - final itemChild = faqItems[index]["answer"]; + final itemTitle = faqItems[index]["question"].toString(); + final itemChild = faqItems[index]["answer"].toString(); return ExpansionTile( - title: Text(itemTitle), + title: Text( + itemTitle + ), children: [ Row( mainAxisAlignment: MainAxisAlignment.start, children: [ Expanded( child: Container( - padding: EdgeInsets.only(left: 15.0, right: 15.0), - child: Text(itemChild), - )) + padding: EdgeInsets.only( + left: 15.0, + right: 15.0 + ), + child: Text( + itemChild, + ), + ) + ) ], ) ], @@ -41,7 +46,7 @@ class FaqPage extends BasePage { }, separatorBuilder: (_, __) => Divider(color: Theme.of(context).dividerTheme.color, height: 1.0), - itemCount: faqItems.length, + itemCount: faqItems == null ? 0 : faqItems.length, ); }, future: rootBundle.loadString(getFaqPath(context)), @@ -78,4 +83,4 @@ class FaqPage extends BasePage { return 'assets/faq/faq_en.json'; } } -} +} \ No newline at end of file