V4.8.1 v1.5.1 (#1038)

* Revert "Cw 397 chatwoot live support (#1011)" This reverts commit af9b5ff10c. * Add Version 4.8.1 configs * Update macos build version [skip ci]
2026-11-14 09:14:05 +01:00 · 2023-08-14 16:57:47 +03:00
parent f4fad4d94d
commit ad6edd9a05
68 changed files with 275 additions and 790 deletions
@@ -1,5 +1,4 @@
 import 'package:cake_wallet/anonpay/anonpay_info_base.dart';
-import 'package:cw_core/hive_type_ids.dart';
 import 'package:cw_core/keyable.dart';
 import 'package:hive/hive.dart';

@@ -36,7 +35,7 @@ class AnonpayInvoiceInfo extends HiveObject with Keyable implements AnonpayInfoB
  @HiveField(13)
  final String provider;

-  static const typeId = ANONPAY_INVOICE_INFO_TYPE_ID;
+  static const typeId = 10;
  static const boxName = 'AnonpayInvoiceInfo';

  AnonpayInvoiceInfo({
@@ -1,8 +1,7 @@
 import 'package:cake_wallet/buy/buy_provider_description.dart';
+import 'package:hive/hive.dart';
 import 'package:cake_wallet/exchange/trade_state.dart';
 import 'package:cw_core/format_amount.dart';
-import 'package:cw_core/hive_type_ids.dart';
-import 'package:hive/hive.dart';

 part 'order.g.dart';

@@ -27,7 +26,7 @@ class Order extends HiveObject {
      }
    }

-  static const typeId = ORDER_TYPE_ID;
+  static const typeId = 8;
  static const boxName = 'Orders';
  static const boxKey = 'ordersBoxKey';

@@ -67,4 +66,4 @@ class Order extends HiveObject {
      BuyProviderDescription.deserialize(raw: providerRaw);

  String amountFormatted() => formatAmount(amount);
-}
+}
@@ -1,6 +1,7 @@
 import 'dart:convert';
 import 'dart:io';
 import 'dart:typed_data';
+import 'package:cake_wallet/entities/cake_2fa_preset_options.dart';
 import 'package:cw_core/wallet_type.dart';
 import 'package:flutter/foundation.dart';
 import 'package:hive/hive.dart';
@@ -9,7 +10,6 @@ import 'package:path_provider/path_provider.dart';
 import 'package:cryptography/cryptography.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 import 'package:archive/archive_io.dart';
-import 'package:cw_core/cake_hive.dart';
 import 'package:cake_wallet/core/key_service.dart';
 import 'package:cake_wallet/entities/encrypt.dart';
 import 'package:cake_wallet/entities/preferences_key.dart';
@@ -17,7 +17,6 @@ import 'package:cake_wallet/entities/secret_store_key.dart';
 import 'package:cw_core/wallet_info.dart';
 import 'package:cake_wallet/.secrets.g.dart' as secrets;
 import 'package:cake_wallet/wallet_types.g.dart';
-
 import 'package:cake_backup/backup.dart' as cake_backup;

 class BackupService {
@@ -171,14 +170,14 @@ class BackupService {

  Future<Box<WalletInfo>> _reloadHiveWalletInfoBox() async {
    final appDir = await getApplicationDocumentsDirectory();
-    await CakeHive.close();
-    CakeHive.init(appDir.path);
+    await Hive.close();
+    Hive.init(appDir.path);

-    if (!CakeHive.isAdapterRegistered(WalletInfo.typeId)) {
-      CakeHive.registerAdapter(WalletInfoAdapter());
+    if (!Hive.isAdapterRegistered(WalletInfo.typeId)) {
+      Hive.registerAdapter(WalletInfoAdapter());
    }

-    return await CakeHive.openBox<WalletInfo>(WalletInfo.boxName);
+    return await Hive.openBox<WalletInfo>(WalletInfo.boxName);
  }

  Future<void> _importPreferencesDump() async {
@@ -36,8 +36,6 @@ import 'package:cake_wallet/src/screens/setup_2fa/modify_2fa_page.dart';
 import 'package:cake_wallet/src/screens/setup_2fa/setup_2fa_qr_page.dart';
 import 'package:cake_wallet/src/screens/setup_2fa/setup_2fa.dart';
 import 'package:cake_wallet/src/screens/setup_2fa/setup_2fa_enter_code_page.dart';
-import 'package:cake_wallet/src/screens/support_chat/support_chat_page.dart';
-import 'package:cake_wallet/src/screens/support_other_links/support_other_links_page.dart';
 import 'package:cake_wallet/src/screens/wallet/wallet_edit_page.dart';
 import 'package:cake_wallet/themes/theme_list.dart';
 import 'package:cake_wallet/utils/device_info.dart';
@@ -871,12 +869,6 @@ Future setup({

  getIt.registerFactory(() => SupportPage(getIt.get<SupportViewModel>()));

-  getIt.registerFactory(() =>
-      SupportChatPage(
-          getIt.get<SupportViewModel>(), secureStorage: getIt.get<FlutterSecureStorage>()));
-
-  getIt.registerFactory(() => SupportOtherLinksPage(getIt.get<SupportViewModel>()));
-
  getIt.registerFactory(() {
    final wallet = getIt.get<AppStore>().wallet;

@@ -1,7 +1,8 @@
-import 'package:cw_core/crypto_currency.dart';
-import 'package:cw_core/hive_type_ids.dart';
-import 'package:cw_core/keyable.dart';
+import 'package:flutter/foundation.dart';
 import 'package:hive/hive.dart';
+import 'package:cw_core/crypto_currency.dart';
+import 'package:cake_wallet/utils/mobx.dart';
+import 'package:cw_core/keyable.dart';

 part 'contact.g.dart';

@@ -13,7 +14,7 @@ class Contact extends HiveObject with Keyable {
    }
  }

-  static const typeId = CONTACT_TYPE_ID;
+  static const typeId = 0;
  static const boxName = 'Contacts';

  @HiveField(0, defaultValue: '')
@@ -1,18 +1,23 @@
 import 'package:flutter_secure_storage/flutter_secure_storage.dart';
-import 'package:cw_core/cake_hive.dart';
+import 'package:hive/hive.dart';

 Future<List<int>> getEncryptionKey(
    {required String forKey, required FlutterSecureStorage secureStorage}) async {
-  final stringifiedKey = await secureStorage.read(key: 'transactionDescriptionsBoxKey');
+  final stringifiedKey =
+      await secureStorage.read(key: 'transactionDescriptionsBoxKey');
  List<int> key;

  if (stringifiedKey == null) {
-    key = CakeHive.generateSecureKey();
+    key = Hive.generateSecureKey();
    final keyStringified = key.join(',');
-    await secureStorage.write(key: 'transactionDescriptionsBoxKey', value: keyStringified);
+    await secureStorage.write(
+        key: 'transactionDescriptionsBoxKey', value: keyStringified);
  } else {
-    key = stringifiedKey.split(',').map((i) => int.parse(i)).toList();
+    key = stringifiedKey
+        .split(',')
+        .map((i) => int.parse(i))
+        .toList();
  }

  return key;
-}
+}
@@ -1,4 +1,3 @@
-import 'package:cw_core/hive_type_ids.dart';
 import 'package:hive/hive.dart';

 part 'template.g.dart';
@@ -15,7 +14,7 @@ class Template extends HiveObject {
      required this.amountFiatRaw,
      this.additionalRecipientsRaw});

-  static const typeId = TEMPLATE_TYPE_ID;
+  static const typeId = 6;
  static const boxName = 'Template';

  @HiveField(0)
@@ -1,4 +1,3 @@
-import 'package:cw_core/hive_type_ids.dart';
 import 'package:hive/hive.dart';

 part 'transaction_description.g.dart';
@@ -7,7 +6,7 @@ part 'transaction_description.g.dart';
 class TransactionDescription extends HiveObject {
  TransactionDescription({required this.id, this.recipientAddress, this.transactionNote});

-  static const typeId = TRANSACTION_TYPE_ID;
+  static const typeId = 2;
  static const boxName = 'TransactionDescriptions';
  static const boxKey = 'transactionDescriptionsBoxKey';

@@ -1,4 +1,3 @@
-import 'package:cw_core/hive_type_ids.dart';
 import 'package:hive/hive.dart';

 part 'exchange_template.g.dart';
@@ -15,7 +14,7 @@ class ExchangeTemplate extends HiveObject {
      required this.depositCurrencyTitleRaw,
      required this.receiveCurrencyTitleRaw});

-  static const typeId = EXCHANGE_TEMPLATE_TYPE_ID;
+  static const typeId = 7;
  static const boxName = 'ExchangeTemplate';

  @HiveField(0)
@@ -1,9 +1,8 @@
+import 'package:hive/hive.dart';
 import 'package:cw_core/crypto_currency.dart';
 import 'package:cake_wallet/exchange/exchange_provider_description.dart';
 import 'package:cake_wallet/exchange/trade_state.dart';
 import 'package:cw_core/format_amount.dart';
-import 'package:cw_core/hive_type_ids.dart';
-import 'package:hive/hive.dart';

 part 'trade.g.dart';

@@ -42,7 +41,7 @@ class Trade extends HiveObject {
    }
  }

-  static const typeId = TRADE_TYPE_ID;
+  static const typeId = 3;
  static const boxName = 'Trades';
  static const boxKey = 'tradesBoxKey';

@@ -7,7 +7,6 @@ import 'package:cake_wallet/locales/locale.dart';
 import 'package:cake_wallet/store/yat/yat_store.dart';
 import 'package:cake_wallet/utils/exception_handler.dart';
 import 'package:cake_wallet/utils/responsive_layout_util.dart';
-import 'package:cw_core/hive_type_ids.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
@@ -39,7 +38,6 @@ import 'package:uni_links/uni_links.dart';
 import 'package:cw_core/unspent_coins_info.dart';
 import 'package:cake_wallet/monero/monero.dart';
 import 'package:cake_wallet/wallet_type_utils.dart';
-import 'package:cw_core/cake_hive.dart';

 final navigatorKey = GlobalKey<NavigatorState>();
 final rootKey = GlobalKey<RootState>();
@@ -59,7 +57,7 @@ Future<void> main() async {
      return true;
    };

-    await CakeHive.close();
+    await Hive.close();

    await initializeAppConfigs();

@@ -71,50 +69,50 @@ Future<void> main() async {

 Future<void> initializeAppConfigs() async {
  final appDir = await getApplicationDocumentsDirectory();
-  CakeHive.init(appDir.path);
+  Hive.init(appDir.path);

-  if (!CakeHive.isAdapterRegistered(Contact.typeId)) {
-    CakeHive.registerAdapter(ContactAdapter());
+  if (!Hive.isAdapterRegistered(Contact.typeId)) {
+    Hive.registerAdapter(ContactAdapter());
  }

-  if (!CakeHive.isAdapterRegistered(Node.typeId)) {
-    CakeHive.registerAdapter(NodeAdapter());
+  if (!Hive.isAdapterRegistered(Node.typeId)) {
+    Hive.registerAdapter(NodeAdapter());
  }

-  if (!CakeHive.isAdapterRegistered(TransactionDescription.typeId)) {
-    CakeHive.registerAdapter(TransactionDescriptionAdapter());
+  if (!Hive.isAdapterRegistered(TransactionDescription.typeId)) {
+    Hive.registerAdapter(TransactionDescriptionAdapter());
  }

-  if (!CakeHive.isAdapterRegistered(Trade.typeId)) {
-    CakeHive.registerAdapter(TradeAdapter());
+  if (!Hive.isAdapterRegistered(Trade.typeId)) {
+    Hive.registerAdapter(TradeAdapter());
  }

-  if (!CakeHive.isAdapterRegistered(WalletInfo.typeId)) {
-    CakeHive.registerAdapter(WalletInfoAdapter());
+  if (!Hive.isAdapterRegistered(WalletInfo.typeId)) {
+    Hive.registerAdapter(WalletInfoAdapter());
  }

-  if (!CakeHive.isAdapterRegistered(WALLET_TYPE_TYPE_ID)) {
-    CakeHive.registerAdapter(WalletTypeAdapter());
+  if (!Hive.isAdapterRegistered(walletTypeTypeId)) {
+    Hive.registerAdapter(WalletTypeAdapter());
  }

-  if (!CakeHive.isAdapterRegistered(Template.typeId)) {
-    CakeHive.registerAdapter(TemplateAdapter());
+  if (!Hive.isAdapterRegistered(Template.typeId)) {
+    Hive.registerAdapter(TemplateAdapter());
  }

-  if (!CakeHive.isAdapterRegistered(ExchangeTemplate.typeId)) {
-    CakeHive.registerAdapter(ExchangeTemplateAdapter());
+  if (!Hive.isAdapterRegistered(ExchangeTemplate.typeId)) {
+    Hive.registerAdapter(ExchangeTemplateAdapter());
  }

-  if (!CakeHive.isAdapterRegistered(Order.typeId)) {
-    CakeHive.registerAdapter(OrderAdapter());
+  if (!Hive.isAdapterRegistered(Order.typeId)) {
+    Hive.registerAdapter(OrderAdapter());
  }

-  if (!isMoneroOnly && !CakeHive.isAdapterRegistered(UnspentCoinsInfo.typeId)) {
-    CakeHive.registerAdapter(UnspentCoinsInfoAdapter());
+  if (!isMoneroOnly && !Hive.isAdapterRegistered(UnspentCoinsInfo.typeId)) {
+    Hive.registerAdapter(UnspentCoinsInfoAdapter());
  }

-  if (!CakeHive.isAdapterRegistered(AnonpayInvoiceInfo.typeId)) {
-    CakeHive.registerAdapter(AnonpayInvoiceInfoAdapter());
+  if (!Hive.isAdapterRegistered(AnonpayInvoiceInfo.typeId)) {
+    Hive.registerAdapter(AnonpayInvoiceInfoAdapter());
  }

  final secureStorage = FlutterSecureStorage();
@@ -122,21 +120,21 @@ Future<void> initializeAppConfigs() async {
      await getEncryptionKey(secureStorage: secureStorage, forKey: TransactionDescription.boxKey);
  final tradesBoxKey = await getEncryptionKey(secureStorage: secureStorage, forKey: Trade.boxKey);
  final ordersBoxKey = await getEncryptionKey(secureStorage: secureStorage, forKey: Order.boxKey);
-  final contacts = await CakeHive.openBox<Contact>(Contact.boxName);
-  final nodes = await CakeHive.openBox<Node>(Node.boxName);
-  final transactionDescriptions = await CakeHive.openBox<TransactionDescription>(
+  final contacts = await Hive.openBox<Contact>(Contact.boxName);
+  final nodes = await Hive.openBox<Node>(Node.boxName);
+  final transactionDescriptions = await Hive.openBox<TransactionDescription>(
      TransactionDescription.boxName,
      encryptionKey: transactionDescriptionsBoxKey);
-  final trades = await CakeHive.openBox<Trade>(Trade.boxName, encryptionKey: tradesBoxKey);
-  final orders = await CakeHive.openBox<Order>(Order.boxName, encryptionKey: ordersBoxKey);
-  final walletInfoSource = await CakeHive.openBox<WalletInfo>(WalletInfo.boxName);
-  final templates = await CakeHive.openBox<Template>(Template.boxName);
-  final exchangeTemplates = await CakeHive.openBox<ExchangeTemplate>(ExchangeTemplate.boxName);
-  final anonpayInvoiceInfo = await CakeHive.openBox<AnonpayInvoiceInfo>(AnonpayInvoiceInfo.boxName);
+  final trades = await Hive.openBox<Trade>(Trade.boxName, encryptionKey: tradesBoxKey);
+  final orders = await Hive.openBox<Order>(Order.boxName, encryptionKey: ordersBoxKey);
+  final walletInfoSource = await Hive.openBox<WalletInfo>(WalletInfo.boxName);
+  final templates = await Hive.openBox<Template>(Template.boxName);
+  final exchangeTemplates = await Hive.openBox<ExchangeTemplate>(ExchangeTemplate.boxName);
+  final anonpayInvoiceInfo = await Hive.openBox<AnonpayInvoiceInfo>(AnonpayInvoiceInfo.boxName);
  Box<UnspentCoinsInfo>? unspentCoinsInfoSource;

  if (!isMoneroOnly) {
-    unspentCoinsInfoSource = await CakeHive.openBox<UnspentCoinsInfo>(UnspentCoinsInfo.boxName);
+    unspentCoinsInfoSource = await Hive.openBox<UnspentCoinsInfo>(UnspentCoinsInfo.boxName);
  }

  await initialSetup(
@@ -41,8 +41,6 @@ import 'package:cake_wallet/src/screens/setup_2fa/setup_2fa_qr_page.dart';
 import 'package:cake_wallet/src/screens/setup_2fa/setup_2fa.dart';
 import 'package:cake_wallet/src/screens/setup_2fa/setup_2fa_enter_code_page.dart';
 import 'package:cake_wallet/src/screens/support/support_page.dart';
-import 'package:cake_wallet/src/screens/support_chat/support_chat_page.dart';
-import 'package:cake_wallet/src/screens/support_other_links/support_other_links_page.dart';
 import 'package:cake_wallet/src/screens/unspent_coins/unspent_coins_details_page.dart';
 import 'package:cake_wallet/src/screens/unspent_coins/unspent_coins_list_page.dart';
 import 'package:cake_wallet/utils/payment_request.dart';
@@ -50,6 +48,7 @@ import 'package:cake_wallet/view_model/dashboard/dashboard_view_model.dart';
 import 'package:cake_wallet/view_model/monero_account_list/account_list_item.dart';
 import 'package:cake_wallet/view_model/node_list/node_create_or_edit_view_model.dart';
 import 'package:cake_wallet/view_model/advanced_privacy_settings_view_model.dart';
+import 'package:cake_wallet/view_model/wallet_list/wallet_list_item.dart';
 import 'package:cake_wallet/wallet_type_utils.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
@@ -442,17 +441,9 @@ Route<dynamic> createRoute(RouteSettings settings) {
          builder: (_) => getIt.get<RestoreFromBackupPage>());

    case Routes.support:
-      return CupertinoPageRoute<void>(
-          builder: (_) => getIt.get<SupportPage>());
-
-    case Routes.supportLiveChat:
-      return CupertinoPageRoute<void>(
-          builder: (_) => getIt.get<SupportChatPage>());
-
-    case Routes.supportOtherLinks:
      return CupertinoPageRoute<void>(
          fullscreenDialog: true,
-          builder: (_) => getIt.get<SupportOtherLinksPage>());
+          builder: (_) => getIt.get<SupportPage>());

    case Routes.unspentCoinsList:
      return MaterialPageRoute<void>(
@@ -48,8 +48,6 @@ class Routes {
  static const editBackupPassword = '/edit_backup_passowrd';
  static const restoreFromBackup = '/restore_from_backup';
  static const support = '/support';
-  static const supportLiveChat = '/support/live_chat';
-  static const supportOtherLinks = '/support/other';
  static const orderDetails = '/order_details';
  static const preOrder = '/pre_order';
  static const buyWebView = '/buy_web_view';
@@ -2,10 +2,12 @@ import 'package:cake_wallet/core/execution_state.dart';
 import 'package:cake_wallet/di.dart';
 import 'package:cake_wallet/src/screens/pin_code/pin_code_widget.dart';
 import 'package:cake_wallet/src/widgets/alert_with_one_action.dart';
+import 'package:cake_wallet/utils/language_list.dart';
 import 'package:cake_wallet/utils/show_pop_up.dart';
 import 'package:cake_wallet/view_model/restore/restore_from_qr_vm.dart';
 import 'package:cake_wallet/view_model/restore/wallet_restore_from_qr_code.dart';
 import 'package:cake_wallet/utils/responsive_layout_util.dart';
+import 'package:cake_wallet/wallet_type_utils.dart';
 import 'package:flutter/material.dart';
 import 'package:cake_wallet/routes.dart';
 import 'package:flutter/cupertino.dart';
@@ -1,11 +1,12 @@
+import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';

 class RestoreButton extends StatelessWidget {
-  const RestoreButton(
-      {required this.onPressed,
-      required this.image,
-      required this.title,
-      required this.description});
+  const RestoreButton({
+    required this.onPressed,
+    required this.image,
+    required this.title,
+    required this.description});

  final VoidCallback onPressed;
  final Image image;
@@ -23,7 +24,10 @@ class RestoreButton extends StatelessWidget {
        alignment: Alignment.topLeft,
        decoration: BoxDecoration(
          borderRadius: BorderRadius.all(Radius.circular(12)),
-          color: Theme.of(context).accentTextTheme.bodySmall!.color!,
+          color: Theme.of(context)
+              .accentTextTheme!
+              .bodySmall!
+              .color!,
        ),
        child: Row(
          mainAxisSize: MainAxisSize.max,
@@ -45,7 +49,7 @@ class RestoreButton extends StatelessWidget {
                          fontSize: 16,
                          fontWeight: FontWeight.w500,
                          color: Theme.of(context)
-                              .primaryTextTheme
+                              .primaryTextTheme!
                              .titleLarge!
                              .color!),
                    ),
@@ -57,7 +61,7 @@ class RestoreButton extends StatelessWidget {
                            fontSize: 14,
                            fontWeight: FontWeight.normal,
                            color: Theme.of(context)
-                                .primaryTextTheme
+                                .primaryTextTheme!
                                .labelSmall!
                                .color!),
                      ),
@@ -6,6 +6,7 @@ class SettingsCellWithArrow extends StandardListRow {
      : super(title: title, isSelected: false, onTap: handler);

  @override
-  Widget buildTrailing(BuildContext context) => Image.asset('assets/images/select_arrow.png',
-      color: Theme.of(context).primaryTextTheme.labelSmall!.color!);
-}
+  Widget buildTrailing(BuildContext context) =>
+      Image.asset('assets/images/select_arrow.png',
+          color: Theme.of(context).primaryTextTheme!.labelSmall!.color!);
+}
@@ -1,78 +1,55 @@
-import 'package:cake_wallet/generated/i18n.dart';
-import 'package:cake_wallet/routes.dart';
-import 'package:cake_wallet/src/screens/support/widgets/support_tiles.dart';
-import 'package:cake_wallet/src/screens/base_page.dart';
-import 'package:cake_wallet/utils/device_info.dart';
+import 'package:cake_wallet/src/screens/settings/widgets/settings_cell_with_arrow.dart';
+import 'package:cake_wallet/src/screens/settings/widgets/settings_link_provider_cell.dart';
+import 'package:cake_wallet/src/widgets/standard_list.dart';
+import 'package:cake_wallet/utils/responsive_layout_util.dart';
+import 'package:cake_wallet/view_model/settings/link_list_item.dart';
+import 'package:cake_wallet/view_model/settings/regular_list_item.dart';
 import 'package:cake_wallet/view_model/support_view_model.dart';
 import 'package:flutter/material.dart';
-import 'package:url_launcher/url_launcher.dart';
+import 'package:cake_wallet/src/screens/base_page.dart';
+import 'package:cake_wallet/generated/i18n.dart';

 class SupportPage extends BasePage {
  SupportPage(this.supportViewModel);

  final SupportViewModel supportViewModel;

-  final imageLiveSupport = Image.asset('assets/images/live_support.png');
-  final imageWalletGuides = Image.asset('assets/images/wallet_guides.png');
-  final imageMoreLinks = Image.asset('assets/images/more_links.png');
-
  @override
  String get title => S.current.settings_support;

-  @override
-  AppBarStyle get appBarStyle => AppBarStyle.regular;
-
  @override
  Widget body(BuildContext context) {
-    return Container(
-      child: Center(
-        child: ConstrainedBox(
-          constraints: BoxConstraints(maxWidth: 330),
-          child: Column(
-            children: [
-              Padding(
-                padding: EdgeInsets.only(top: 24),
-                child: SupportTile(
-                  image: imageLiveSupport,
-                  title: S.of(context).support_title_live_chat,
-                  description: S.of(context).support_description_live_chat,
-                  onPressed: () {
-                    if (DeviceInfo.instance.isDesktop) {
-                      _launchUrl(supportViewModel.fetchUrl());
-                    } else {
-                      Navigator.pushNamed(context, Routes.supportLiveChat);
-                    }
-                  },
-                ),
-              ),
-              Padding(
-                padding: EdgeInsets.only(top: 24),
-                child: SupportTile(
-                  image: imageWalletGuides,
-                  title: S.of(context).support_title_guides,
-                  description: S.of(context).support_description_guides,
-                  onPressed: () => _launchUrl(supportViewModel.guidesUrl),
-                ),
-              ),
-              Padding(
-                padding: EdgeInsets.only(top: 24),
-                child: SupportTile(
-                  image: imageMoreLinks,
-                  title: S.of(context).support_title_other_links,
-                  description: S.of(context).support_description_other_links,
-                  onPressed: () => Navigator.pushNamed(context, Routes.supportOtherLinks),
-                ),
-              ),
-            ],
-          ),
-        ),
+    final iconColor = Theme.of(context)
+        .accentTextTheme!
+        .displayLarge!
+        .backgroundColor!;
+    // FIX-ME: Added `context` it was not used here before, maby bug ?
+    return Center(
+      child: ConstrainedBox(
+        constraints: BoxConstraints(maxWidth: 500),
+        child: SectionStandardList(
+            context: context,
+            sectionCount: 1,
+            itemCounter: (int _) => supportViewModel.items.length,
+            itemBuilder: (_, __, index) {
+              final item = supportViewModel.items[index];
+
+              if (item is RegularListItem) {
+                return SettingsCellWithArrow(title: item.title, handler: item.handler);
+              }
+
+              if (item is LinkListItem) {
+                return SettingsLinkProviderCell(
+                    title: item.title,
+                    icon: item.icon,
+                    iconColor: item.hasIconColor ? iconColor : null,
+                    link: item.link,
+                    linkTitle: item.linkTitle);
+              }
+
+              return Container();
+            }),
      ),
    );
  }
-
-  void _launchUrl(String url) async {
-    try {
-      await launchUrl(Uri.parse(url), mode: LaunchMode.externalApplication);
-    } catch (e) {}
-  }
 }
@@ -1,69 +0,0 @@
-import 'package:flutter/material.dart';
-
-class SupportTile extends StatelessWidget {
-  const SupportTile(
-      {required this.onPressed,
-      required this.image,
-      required this.title,
-      required this.description});
-
-  final VoidCallback onPressed;
-  final Image image;
-  final String title;
-  final String description;
-
-  @override
-  Widget build(BuildContext context) {
-    return GestureDetector(
-      onTap: onPressed,
-      child: Container(
-        width: double.infinity,
-        padding: EdgeInsets.all(24),
-        alignment: Alignment.center,
-        decoration: BoxDecoration(
-          borderRadius: BorderRadius.all(Radius.circular(12)),
-          color: Theme.of(context).accentTextTheme.bodySmall!.color!,
-        ),
-        child: Row(
-          mainAxisSize: MainAxisSize.max,
-          mainAxisAlignment: MainAxisAlignment.center,
-          crossAxisAlignment: CrossAxisAlignment.start,
-          children: <Widget>[
-            image,
-            Expanded(
-              child: Padding(
-                padding: EdgeInsets.only(left: 16),
-                child: Column(
-                  mainAxisSize: MainAxisSize.max,
-                  mainAxisAlignment: MainAxisAlignment.start,
-                  crossAxisAlignment: CrossAxisAlignment.start,
-                  children: <Widget>[
-                    Text(
-                      title,
-                      style: TextStyle(
-                        fontSize: 20,
-                        fontWeight: FontWeight.w500,
-                        color: Theme.of(context).primaryTextTheme.titleLarge!.color!,
-                      ),
-                    ),
-                    Padding(
-                      padding: EdgeInsets.only(top: 5),
-                      child: Text(
-                        description,
-                        style: TextStyle(
-                          fontSize: 16,
-                          fontWeight: FontWeight.normal,
-                          color: Theme.of(context).primaryTextTheme.labelSmall!.color!,
-                        ),
-                      ),
-                    )
-                  ],
-                ),
-              ),
-            )
-          ],
-        ),
-      ),
-    );
-  }
-}
@@ -1,38 +0,0 @@
-import 'package:cake_wallet/generated/i18n.dart';
-import 'package:cake_wallet/src/screens/base_page.dart';
-import 'package:cake_wallet/src/screens/support_chat/widgets/chatwoot_widget.dart';
-import 'package:cake_wallet/view_model/support_view_model.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_secure_storage/flutter_secure_storage.dart';
-
-
-class SupportChatPage extends BasePage {
-  SupportChatPage(this.supportViewModel, {required this.secureStorage});
-
-  final SupportViewModel supportViewModel;
-  final FlutterSecureStorage secureStorage;
-
-  @override
-  String get title => S.current.settings_support;
-
-  @override
-  AppBarStyle get appBarStyle => AppBarStyle.regular;
-
-  @override
-  Widget body(BuildContext context) => FutureBuilder<String>(
-        future: getCookie(),
-        builder: (BuildContext context, AsyncSnapshot<String> snapshot) {
-          print(snapshot.data);
-          if (snapshot.hasData)
-            return ChatwootWidget(
-              secureStorage,
-              supportUrl: supportViewModel.fetchUrl(authToken: snapshot.data!)
-            );
-          return Container();
-        },
-      );
-
-  Future<String> getCookie() async {
-    return await secureStorage.read(key: COOKIE_KEY) ?? "";
-  }
-}
@@ -1,62 +0,0 @@
-import 'dart:convert';
-
-import 'package:flutter/material.dart';
-import 'package:flutter_inappwebview/flutter_inappwebview.dart';
-import 'package:flutter_secure_storage/flutter_secure_storage.dart';
-
-const COOKIE_KEY = 'chatwootCookie';
-
-class ChatwootWidget extends StatefulWidget {
-  ChatwootWidget(this.secureStorage, {required this.supportUrl});
-
-  final FlutterSecureStorage secureStorage;
-  final String supportUrl;
-
-  @override
-  ChatwootWidgetState createState() => ChatwootWidgetState();
-}
-
-class ChatwootWidgetState extends State<ChatwootWidget> {
-  final GlobalKey _webViewkey = GlobalKey();
-
-  @override
-  Widget build(BuildContext context) => InAppWebView(
-        key: _webViewkey,
-        initialOptions: InAppWebViewGroupOptions(
-          crossPlatform: InAppWebViewOptions(transparentBackground: true),
-        ),
-        initialUrlRequest: URLRequest(url: Uri.tryParse(widget.supportUrl)),
-        onWebViewCreated: (InAppWebViewController controller) {
-          controller.addWebMessageListener(
-            WebMessageListener(
-              jsObjectName: 'ReactNativeWebView',
-              onPostMessage: (String? message, Uri? sourceOrigin, bool isMainFrame,
-                  JavaScriptReplyProxy replyProxy) {
-                final shortenedMessage = message?.substring(16);
-                if (shortenedMessage != null && isJsonString(shortenedMessage)) {
-                  final parsedMessage = jsonDecode(shortenedMessage);
-                  final eventType = parsedMessage["event"];
-                  if (eventType == 'loaded') {
-                    final authToken = parsedMessage["config"]["authToken"];
-                    print(authToken);
-                    storeCookie(authToken as String);
-                  }
-                }
-              },
-            ),
-          );
-        },
-      );
-
-  bool isJsonString(String str) {
-    try {
-      jsonDecode(str);
-    } catch (e) {
-      return false;
-    }
-    return true;
-  }
-
-  Future<void> storeCookie(String value) async =>
-      await widget.secureStorage.write(key: COOKIE_KEY, value: value);
-}
@@ -1,58 +0,0 @@
-import 'package:cake_wallet/src/screens/settings/widgets/settings_cell_with_arrow.dart';
-import 'package:cake_wallet/src/screens/settings/widgets/settings_link_provider_cell.dart';
-import 'package:cake_wallet/src/widgets/standard_list.dart';
-import 'package:cake_wallet/view_model/settings/link_list_item.dart';
-import 'package:cake_wallet/view_model/settings/regular_list_item.dart';
-import 'package:cake_wallet/view_model/support_view_model.dart';
-import 'package:flutter/material.dart';
-import 'package:cake_wallet/src/screens/base_page.dart';
-import 'package:cake_wallet/generated/i18n.dart';
-
-class SupportOtherLinksPage extends BasePage {
-  SupportOtherLinksPage(this.supportViewModel);
-
-  final SupportViewModel supportViewModel;
-
-  @override
-  String get title => S.current.settings_support;
-
-  @override
-  AppBarStyle get appBarStyle => AppBarStyle.transparent;
-
-  @override
-  Widget body(BuildContext context) {
-    final iconColor =
-        Theme.of(context).accentTextTheme.displayLarge!.backgroundColor!;
-
-    return Container(
-      child: Center(
-        child: ConstrainedBox(
-          constraints: BoxConstraints(maxWidth: 500),
-          child: SectionStandardList(
-              context: context,
-              sectionCount: 1,
-              itemCounter: (int _) => supportViewModel.items.length,
-              itemBuilder: (_, __, index) {
-                final item = supportViewModel.items[index];
-
-                if (item is RegularListItem) {
-                  return SettingsCellWithArrow(
-                      title: item.title, handler: item.handler);
-                }
-
-                if (item is LinkListItem) {
-                  return SettingsLinkProviderCell(
-                      title: item.title,
-                      icon: item.icon,
-                      iconColor: item.hasIconColor ? iconColor : null,
-                      link: item.link,
-                      linkTitle: item.linkTitle);
-                }
-
-                return Container();
-              }),
-        ),
-      ),
-    );
-  }
-}
@@ -1,9 +1,12 @@
 import 'package:cake_wallet/generated/i18n.dart';
 import 'package:cake_wallet/view_model/settings/link_list_item.dart';
+import 'package:cake_wallet/view_model/settings/regular_list_item.dart';
 import 'package:cake_wallet/view_model/settings/settings_list_item.dart';
-import 'package:cake_wallet/wallet_type_utils.dart';
+import 'package:flutter/cupertino.dart';
+import 'package:flutter/material.dart';
 import 'package:mobx/mobx.dart';
-import 'package:cake_wallet/.secrets.g.dart' as secrets;
+import 'package:url_launcher/url_launcher.dart';
+import 'package:cake_wallet/wallet_type_utils.dart';

 part 'support_view_model.g.dart';

@@ -12,6 +15,14 @@ class SupportViewModel = SupportViewModelBase with _$SupportViewModel;
 abstract class SupportViewModelBase with Store {
  SupportViewModelBase()
  : items = [
+      RegularListItem(
+        title: S.current.faq,
+        handler: (BuildContext context) async {
+          try {
+            await launch(url);
+          } catch (e) {}
+        },
+      ),
      LinkListItem(
          title: 'Email',
          linkTitle: 'support@cakewallet.com',
@@ -74,17 +85,7 @@ abstract class SupportViewModelBase with Store {
      //    link: 'mailto:support@y.at')
  ];

-  final guidesUrl = 'https://guides.cakewallet.com';
-
-  String fetchUrl({String locale = "en", String authToken = ""}) {
-    var supportUrl =
-        "https://support.cakewallet.com/widget?website_token=${secrets.chatwootWebsiteToken}&locale=${locale}";
-
-    if (authToken.isNotEmpty)
-      supportUrl += "&cw_conversation=$authToken";
-
-    return supportUrl;
-  }
+  static const url = 'https://guides.cakewallet.com';

  List<SettingsListItem> items;
-}
+}