Merge branch 'dev' into cw-1497-transaction-history-improved-layout

lib/src/screens/buy/buy_sell_page.dart

@@ -1,7 +1,7 @@
 import 'package:cake_wallet/buy/sell_buy_states.dart';
+import 'package:cake_wallet/core/address_resolver/address_resolver_service.dart';
 import 'package:cake_wallet/core/address_validator.dart';
 import 'package:cake_wallet/di.dart';
-import 'package:cake_wallet/entities/parse_address_from_domain.dart';
 import 'package:cake_wallet/generated/i18n.dart';
 import 'package:cake_wallet/new-ui/widgets/currency_picker/currency_picker_args.dart';
 import 'package:cake_wallet/new-ui/widgets/currency_picker/currency_picker_sheet.dart';
@@ -16,7 +16,6 @@ import 'package:cake_wallet/src/widgets/primary_button.dart';
 import 'package:cake_wallet/src/widgets/provider_optoin_tile.dart';
 import 'package:cake_wallet/src/widgets/scrollable_with_bottom_section.dart';
 import 'package:cake_wallet/src/widgets/trail_button.dart';
-import 'package:cake_wallet/src/screens/send/widgets/extract_address_from_parsed.dart';
 import 'package:cake_wallet/utils/responsive_layout_util.dart';
 import 'package:cake_wallet/view_model/buy/buy_sell_view_model.dart';
 import 'package:cw_core/crypto_currency.dart';
@@ -28,9 +27,10 @@ import 'package:keyboard_actions/keyboard_actions.dart';
 import 'package:mobx/mobx.dart';
 
 class BuySellPage extends BasePage {
-  BuySellPage(this.buySellViewModel);
+  BuySellPage(this.buySellViewModel, this._resolver);
 
   final BuySellViewModel buySellViewModel;
+  final AddressResolverService _resolver;
   final cryptoCurrencyKey = GlobalKey<ExchangeCardState>();
   final fiatCurrencyKey = GlobalKey<ExchangeCardState>();
   final _formKey = GlobalKey<FormState>();
@@ -300,7 +300,7 @@ class BuySellPage extends BasePage {
     });
 
     reaction((_) => buySellViewModel.cryptoCurrencyAddress, (String address) {
-      if (cryptoAddressController != address) {
+      if (cryptoAddressController.text != address) {
         cryptoCurrencyKey.currentState!.addressController.text = address;
       }
     });
@@ -320,8 +320,10 @@ class BuySellPage extends BasePage {
     _cryptoAddressFocus.addListener(() async {
       if (!_cryptoAddressFocus.hasFocus && cryptoAddressController.text.isNotEmpty) {
         final domain = cryptoAddressController.text;
-        buySellViewModel.cryptoCurrencyAddress = await fetchParsedAddress(
-            context, domain, buySellViewModel.cryptoCurrency);
+        final parsed = await fetchParsedAddress(context, domain, buySellViewModel.cryptoCurrency);
+        if (parsed.isNotEmpty) {
+          buySellViewModel.cryptoCurrencyAddress = parsed;
+        }
       }
     });
 
@@ -410,8 +412,23 @@ class BuySellPage extends BasePage {
         currencyButtonColor: Colors.transparent,
         addressButtonsColor: Theme.of(context).colorScheme.surfaceContainerHighest,
         borderColor: Theme.of(context).colorScheme.outlineVariant,
-        onPushPasteButton: (context) async {},
-        onPushAddressBookButton: (context) async {},
+        onPushPasteButton: (context) async {
+          final domain = cryptoCurrencyKey.currentState!.addressController.text;
+          final parsed =
+          await fetchParsedAddress(context, domain, buySellViewModel.cryptoCurrency);
+          if (parsed.isNotEmpty) {
+            buySellViewModel.cryptoCurrencyAddress = parsed;
+          }
+        },
+
+        onPushAddressBookButton: (context) async {
+          final domain = cryptoCurrencyKey.currentState!.addressController.text;
+          final parsed =
+          await fetchParsedAddress(context, domain, buySellViewModel.cryptoCurrency);
+          if (parsed.isNotEmpty) {
+            buySellViewModel.cryptoCurrencyAddress = parsed;
+          }
+        },
         fillColor: buySellViewModel.isBuyAction
             ? Theme.of(context).colorScheme.surfaceContainer
             : Theme.of(context).colorScheme.surfaceContainerLow,
@@ -537,9 +554,10 @@ class BuySellPage extends BasePage {
     String domain,
     CryptoCurrency currency,
   ) async {
-    final parsedAddress =
-        await getIt.get<AddressResolver>().resolve(context, domain, currency);
-    final address = await extractAddressFromParsed(context, parsedAddress);
-    return address;
+    final parsedAddresses = await _resolver.resolve(
+        query: domain, wallet: buySellViewModel.wallet, currency: currency);
+    return parsedAddresses.isNotEmpty
+        ? parsedAddresses.first.parsedAddressByCurrencyMap[currency] ?? ''
+        : '';
   }
 }

lib/src/screens/contact/contact_list_page.dart

@@ -340,6 +340,7 @@ class _ContactListBodyState extends State<ContactListBody> {
           updateFunction: widget.contactListViewModel.reorderAccordingToContactList,
           canReorder: widget.contactListViewModel.isEditable,
           shrinkWrap: true,
+          padding: const EdgeInsets.only(bottom: 250),
           itemBuilder: (context, index) {
             final contact = contacts[index];
             final contactContent =

lib/src/screens/contact/contact_page.dart

@@ -1,3 +1,4 @@
+import 'package:cake_wallet/core/address_resolver/parsed_address.dart';
 import 'package:cake_wallet/core/address_validator.dart';
 import 'package:cake_wallet/new-ui/widgets/send_page/send_address_input.dart';
 import 'package:cake_wallet/utils/show_pop_up.dart';
@@ -27,7 +28,15 @@ class ContactPage extends BasePage {
     _nameController.text = contactViewModel.name;
     _addressController.text = contactViewModel.address;
     _nameController.addListener(() => contactViewModel.name = _nameController.text);
-    _addressController.addListener(() => contactViewModel.address = _addressController.text);
+    _addressController.addListener(() {
+      final address = _addressController.text;
+
+      if (address != contactViewModel.address) {
+        contactViewModel.displayName = '';
+      }
+
+      contactViewModel.address = address;
+    });
 
     autorun((_) => _currencyTypeController.text = "${contactViewModel.currency?.toString() ?? ""} ${contactViewModel.currency?.tag != null ? "(${contactViewModel.currency?.tag})" : ""}");
   }
@@ -98,7 +107,8 @@ class ContactPage extends BasePage {
                           focusNode: addressFocusNode,
                         displayName: contactViewModel.displayName,
                         addressController: _addressController,
-                        onEditingComplete: ()=> contactViewModel.extractParsedAddress(context),
+                        onEditingComplete: () {},
+                        onPushPasteButton: (context) => _extractParsedAddress(context),
                         validator: AddressValidator(type: contactViewModel.currency!),
                         selectedCurrency: contactViewModel.currency!,
                       );
@@ -129,8 +139,7 @@ class ContactPage extends BasePage {
                   builder: (_) => PrimaryButton(
                     onPressed: () async {
                       FocusScope.of(context).unfocus();
-
-                      await contactViewModel.extractParsedAddress(context);
+                      _extractParsedAddress(context);
 
                       if (_formKey.currentState != null && !_formKey.currentState!.validate()) {
                         return;
@@ -150,6 +159,16 @@ class ContactPage extends BasePage {
     );
   }
 
+  Future<void> _extractParsedAddress(BuildContext context) async {
+    final parsedAddress = await contactViewModel.extractParsedAddress(context);
+    if (parsedAddress == null) return;
+
+    final confirmed = await showParsedAddressConfirmationAlert(context, parsedAddress);
+    if (!confirmed) return;
+
+    contactViewModel.applyParsedAddress(parsedAddress);
+  }
+
   void _presentCurrencyPicker(BuildContext context) {
     showPopUp<void>(
       builder: (_) => CurrencyPicker(
@@ -203,4 +222,29 @@ class ContactPage extends BasePage {
       }
     });
   }
+
+  Future<bool> showParsedAddressConfirmationAlert(
+      BuildContext context,
+      ParsedAddress parsedAddress,
+      ) async {
+    final confirmed = await showPopUp<bool>(
+      context: context,
+      builder: (BuildContext context) {
+        return AlertWithOneAction(
+          alertTitle: S.of(context).address_detected,
+          headerTitleText: parsedAddress.profileName.isEmpty ? null : parsedAddress.profileName,
+          headerImageProfileUrl: parsedAddress.profileImageUrl.isEmpty
+              ? parsedAddress.addressSource.iconPath
+              : parsedAddress.profileImageUrl,
+          alertContent: S.of(context).extracted_address_content(
+            '${parsedAddress.handle} (${parsedAddress.addressSource.label})',
+          ),
+          buttonText: S.of(context).ok,
+          buttonAction: () => Navigator.of(context).pop(true),
+        );
+      },
+    );
+
+    return confirmed ?? false;
+  }
 }

lib/src/screens/dashboard/pages/cake_features_page.dart

@@ -148,6 +148,15 @@ class CakeFeaturesPage extends StatelessWidget {
           subTitle: "Turn your old phone into your new hardware wallet with our new app",
           image: 'assets/images/cupcake.png',
         ),
+        AppsWidget(
+          isWide: true,
+          isLink: true,
+          isCake: true,
+          onTap: () => _launchUrl("radar.chat"),
+          title: "Radar",
+          subTitle: "Your messages. Your Bitcoin. Together, at last",
+          image: 'assets/images/radar.png',
+        ),
         const SizedBox(height: 12),
         Padding(
           padding: const EdgeInsets.only(left: 24, top: 16, bottom: 8),

lib/src/screens/exchange/exchange_page.dart

@@ -1,3 +1,4 @@
+import 'package:cake_wallet/core/address_resolver/address_resolver_service.dart';
 import 'package:cake_wallet/exchange/exchange_provider_description.dart';
 import 'package:cake_wallet/exchange/provider/chainflip_exchange_provider.dart';
 import 'package:cake_wallet/exchange/provider/thorchain_exchange.provider.dart';
@@ -11,8 +12,6 @@ import 'package:cake_wallet/utils/payment_request.dart';
 import 'package:cake_wallet/utils/responsive_layout_util.dart';
 import 'package:cw_core/sync_status.dart';
 import 'package:cw_core/utils/print_verbose.dart';
-import 'package:cake_wallet/entities/parse_address_from_domain.dart';
-import 'package:cake_wallet/src/screens/send/widgets/extract_address_from_parsed.dart';
 import 'package:cake_wallet/src/widgets/standard_checkbox.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_mobx/flutter_mobx.dart';
@@ -41,7 +40,7 @@ import 'package:cake_wallet/src/screens/exchange/widgets/present_provider_picker
 import 'package:cake_wallet/src/screens/dashboard/widgets/sync_indicator_icon.dart';
 
 class ExchangePage extends BasePage {
-  ExchangePage(this.exchangeViewModel, this.authService, this.initialPaymentRequest) {
+  ExchangePage(this.exchangeViewModel, this.authService, this.adrResService, this.initialPaymentRequest) {
     depositWalletName = exchangeViewModel.depositCurrency == CryptoCurrency.xmr
         ? exchangeViewModel.wallet.name
         : null;
@@ -52,6 +51,7 @@ class ExchangePage extends BasePage {
 
   final ExchangeViewModel exchangeViewModel;
   final AuthService authService;
+  final AddressResolverService adrResService;
   final PaymentRequest? initialPaymentRequest;
   final depositKey = GlobalKey<ExchangeCardState>();
   final receiveKey = GlobalKey<ExchangeCardState>();
@@ -655,8 +655,8 @@ class ExchangePage extends BasePage {
 
   Future<String> fetchParsedAddress(
       BuildContext context, String domain, CryptoCurrency currency) async {
-    final parsedAddress = await getIt.get<AddressResolver>().resolve(context, domain, currency);
-    return extractAddressFromParsed(context, parsedAddress);
+    final parsedAddresses = await adrResService.resolve(query: domain, wallet:exchangeViewModel.wallet, currency: currency);
+    return parsedAddresses.isNotEmpty ? parsedAddresses.first.parsedAddressByCurrencyMap[currency] ?? '' : '';
   }
 
   void _showFeeAlert(BuildContext context) async {

lib/src/screens/new_wallet/new_wallet_type_page.dart

@@ -139,68 +139,71 @@ class WalletTypeFormState extends State<WalletTypeForm> {
               child: SingleChildScrollView(
                 child: Padding(
                   padding: const EdgeInsets.only(left: 18, right: 18, bottom: 12),
-                  child: Container(
-                    decoration: BoxDecoration(
-                      color: Theme.of(context).colorScheme.surfaceContainer,
-                      borderRadius: BorderRadius.circular(18),
-                    ),
-                    child: ListView.separated(
-                      key: const ValueKey('new_wallet_type_scrollable_key'),
-                      itemCount: filteredTypes.length,
-                      shrinkWrap: true,
-                      physics: NeverScrollableScrollPhysics(),
-                      padding: EdgeInsets.zero,
-                      itemBuilder: (context, index) {
-                        final item = filteredTypes[index];
-              
-                        return GestureDetector(
-                          key: ValueKey('new_wallet_type_${item.name}_button_key'),
-                          behavior: HitTestBehavior.opaque,
-                          onTap: () {
-                            onTypeSelected(item);
-                          },
-                          child: SizedBox(
-                            height: 48,
-                            child: Padding(
-                              padding: const EdgeInsets.symmetric(horizontal: 12.0),
-                              child: Row(
-                                mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                                children: [
-                                  Row(
-                                    children: [
-                                      CakeImageWidget(
-                                        height: 24,
-                                        width: 24,
-                                        imageUrl: getCryptoCurrencyIconForWalletListItem(item),
-                                      ),
-                                      const SizedBox(width: 12),
-                                      Text(walletTypeToDisplayName(item)),
-                                      const SizedBox(width: 4),
-                                      Text(
-                                        walletTypeToDisplayTicker(item),
-                                        style: TextStyle(
-                                          color: Theme.of(context).colorScheme.onSurfaceVariant,
+                  child: ClipRRect(
+                    borderRadius: BorderRadius.circular(18),
+                    child: Container(
+                      decoration: BoxDecoration(
+                        color: Theme.of(context).colorScheme.surfaceContainer,
+                        borderRadius: BorderRadius.circular(18),
+                      ),
+                      child: ListView.separated(
+                        key: const ValueKey('new_wallet_type_scrollable_key'),
+                        itemCount: filteredTypes.length,
+                        shrinkWrap: true,
+                        physics: NeverScrollableScrollPhysics(),
+                        padding: EdgeInsets.zero,
+                        itemBuilder: (context, index) {
+                          final item = filteredTypes[index];
+
+                          return GestureDetector(
+                            key: ValueKey('new_wallet_type_${item.name}_button_key'),
+                            behavior: HitTestBehavior.opaque,
+                            onTap: () {
+                              onTypeSelected(item);
+                            },
+                            child: SizedBox(
+                              height: 50,
+                              child: Padding(
+                                padding: const EdgeInsets.symmetric(horizontal: 12.0),
+                                child: Row(
+                                  mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                                  children: [
+                                    Row(
+                                      children: [
+                                        CakeImageWidget(
+                                          height: 24,
+                                          width: 24,
+                                          imageUrl: getCryptoCurrencyIconForWalletListItem(item),
                                         ),
-                                      )
-                                    ],
-                                  ),
-                                  CakeImageWidget(
-                                    imageUrl: "assets/new-ui/arrow_forward.svg",
-                                    height: 16,
-                                    colorFilter: ColorFilter.mode(
-                                      Theme.of(context).colorScheme.onSurfaceVariant,
-                                      BlendMode.srcIn,
+                                        const SizedBox(width: 12),
+                                        Text(walletTypeToDisplayName(item)),
+                                        const SizedBox(width: 4),
+                                        Text(
+                                          walletTypeToDisplayTicker(item),
+                                          style: TextStyle(
+                                            color: Theme.of(context).colorScheme.onSurfaceVariant,
+                                          ),
+                                        )
+                                      ],
                                     ),
-                                  )
-                                ],
+                                    CakeImageWidget(
+                                      imageUrl: "assets/new-ui/arrow_forward.svg",
+                                      height: 16,
+                                      colorFilter: ColorFilter.mode(
+                                        Theme.of(context).colorScheme.onSurfaceVariant,
+                                        BlendMode.srcIn,
+                                      ),
+                                    )
+                                  ],
+                                ),
                               ),
                             ),
-                          ),
-                        );
-                      },
-                      separatorBuilder: (context, index) => Container(
-                        height: 1,
-                        color: Theme.of(context).colorScheme.surfaceContainerHigh,
+                          );
+                        },
+                        separatorBuilder: (context, index) => Container(
+                          height: 1,
+                          color: Theme.of(context).colorScheme.surfaceContainerHigh,
+                        ),
                       ),
                     ),
                   ),

lib/src/screens/send/send_page.dart

@@ -780,7 +780,6 @@ class SendPage extends BasePage {
     }
 
     output.resetParsedAddress();
-    await output.fetchParsedAddress(context);
   }
 
   Output _defineCurrentOutput() {

lib/src/screens/send/widgets/extract_address_from_parsed.dart

@@ -1,150 +0,0 @@
-import 'package:cake_wallet/entities/parsed_address.dart';
-import 'package:cake_wallet/src/widgets/alert_with_one_action.dart';
-import 'package:cake_wallet/utils/show_pop_up.dart';
-import 'package:flutter/material.dart';
-import 'package:cake_wallet/generated/i18n.dart';
-import 'choose_yat_address_alert.dart';
-
-Future<String> extractAddressFromParsed(
-    BuildContext? context,
-    ParsedAddress parsedAddress) async {
-  if (context == null || !context.mounted) return parsedAddress.addresses.first;
-
-  var title = '';
-  var content = '';
-  var address = '';
-  var profileImageUrl = '';
-  var profileName = '';
-
-  switch (parsedAddress.parseFrom) {
-    case ParseFrom.unstoppableDomains:
-      title = S.of(context).address_detected;
-      content = S.of(context).address_from_domain(parsedAddress.name);
-      address = parsedAddress.addresses.first;
-      break;
-    case ParseFrom.ens:
-      title = S.of(context).address_detected;
-      content = S.of(context).extracted_address_content('${parsedAddress.name} (ENS)');
-      address = parsedAddress.addresses.first;
-      break;
-    case ParseFrom.openAlias:
-      title = S.of(context).address_detected;
-      content = S.of(context).extracted_address_content('${parsedAddress.name} (OpenAlias)');
-      address = parsedAddress.addresses.first;
-      break;
-    case ParseFrom.wellKnown:
-      title = S.of(context).address_detected;
-      content = S.of(context).extracted_address_content('${parsedAddress.name} (Well-Known)');
-      address = parsedAddress.addresses.first;
-      break;
-    case ParseFrom.fio:
-      title = S.of(context).address_detected;
-      content = S.of(context).extracted_address_content('${parsedAddress.name} (FIO)');
-      address = parsedAddress.addresses.first;
-      break;
-    case ParseFrom.twitter:
-      title = S.of(context).address_detected;
-      content = S.of(context).extracted_address_content('${parsedAddress.name} (Twitter)');
-      address = parsedAddress.addresses.first;
-      profileImageUrl = parsedAddress.profileImageUrl;
-      profileName = parsedAddress.profileName;
-      break;
-    case ParseFrom.mastodon:
-      title = S.of(context).address_detected;
-      content = S.of(context).extracted_address_content('${parsedAddress.name} (Mastodon)');
-      address = parsedAddress.addresses.first;
-      profileImageUrl = parsedAddress.profileImageUrl;
-      profileName = parsedAddress.profileName;
-      break;
-    case ParseFrom.nostr:
-      title = S.of(context).address_detected;
-      content = S.of(context).extracted_address_content('${parsedAddress.name} (Nostr NIP-05)');
-      address = parsedAddress.addresses.first;
-      profileImageUrl = parsedAddress.profileImageUrl;
-      profileName = parsedAddress.profileName;
-      break;
-    case ParseFrom.thorChain:
-      title = S.of(context).address_detected;
-      content = S.of(context).extracted_address_content('${parsedAddress.name} (ThorChain)');
-      address = parsedAddress.addresses.first;
-      break;
-    case ParseFrom.zanoAlias:
-      title = S.of(context).address_detected;
-      content = S.of(context).extracted_address_content('${parsedAddress.name} (Zano Alias)');
-      address = parsedAddress.addresses.first;
-      break;
-    case ParseFrom.zcashAddress:
-      title = S.of(context).address_detected;
-      content = S.of(context).extracted_address_content('${parsedAddress.name} (Zcash.me)');
-      address = parsedAddress.addresses.first;
-      break;
-    case ParseFrom.zcashName:
-      title = S.of(context).address_detected;
-      content = S.of(context).extracted_address_content('${parsedAddress.name} (Zcash Names)');
-      address = parsedAddress.addresses.first;
-      break;
-    case ParseFrom.bip353:
-      title = S.of(context).address_detected;
-      content = S.of(context).extracted_address_content('${parsedAddress.name} (BIP-353)');
-      address = parsedAddress.addresses.first;
-      break;
-    case ParseFrom.lnurlpay:
-      title = S.of(context).address_detected;
-      content = S.of(context).extracted_address_content('${parsedAddress.name} (Lightning)');
-      address = parsedAddress.addresses.first;
-      break;
-    case ParseFrom.yatRecord:
-      if (parsedAddress.name.isEmpty) {
-        title = S.of(context).yat_error;
-        content = S.of(context).yat_error_content;
-        address = parsedAddress.addresses.first;
-        break;
-      }
-
-      title = S.of(context).address_detected;
-      content = S.of(context).address_from_yat(parsedAddress.name);
-
-      if (parsedAddress.addresses.length == 1) {
-        address = parsedAddress.addresses.first;
-        break;
-      }
-
-      content += S.of(context).choose_address;
-
-      address = await showPopUp<String?>(
-            context: context,
-            builder: (context) => PopScope(
-              child: ChooseYatAddressAlert(
-                alertTitle: title,
-                alertContent: content,
-                addresses: parsedAddress.addresses,
-              ),
-              canPop: false,
-            ),
-          ) ??
-          '';
-
-      if (address.isEmpty) {
-        return parsedAddress.name;
-      }
-
-      return address;
-    case ParseFrom.contact:
-    case ParseFrom.notParsed:
-      return parsedAddress.addresses.first;
-  }
-
-  await showPopUp<void>(
-    context: context,
-    builder: (context) => AlertWithOneAction(
-      alertTitle: title,
-      headerTitleText: profileName.isEmpty ? null : profileName,
-      headerImageProfileUrl: profileImageUrl.isEmpty ? null : profileImageUrl,
-      alertContent: content,
-      buttonText: S.of(context).ok,
-      buttonAction: () => Navigator.of(context).pop(),
-    ),
-  );
-
-  return address;
-}

lib/src/screens/send/widgets/send_card.dart

@@ -594,7 +594,6 @@ class SendCardState extends State<SendCard> with AutomaticKeepAliveClientMixin<S
                   controller: addressController,
                   onURIScanned: (uri) async {
                     output.resetParsedAddress();
-                    await output.fetchParsedAddress(context);
 
                     // Process the payment through the new flow
                     await _handlePaymentFlow(
@@ -620,7 +619,6 @@ class SendCardState extends State<SendCard> with AutomaticKeepAliveClientMixin<S
                     _justHandledPasteButton = true;
                     try {
                       output.resetParsedAddress();
-                      await output.fetchParsedAddress(context);
 
                       final address =
                           output.isParsedAddress ? output.extractedAddress : output.address;
@@ -643,7 +641,6 @@ class SendCardState extends State<SendCard> with AutomaticKeepAliveClientMixin<S
                     output.resetParsedAddress();
                   },
                   onSelectedContact: (contact) {
-                    output.loadContact(contact);
                   },
                   validator: validator,
                   selectedCurrency: sendViewModel.selectedCryptoCurrency,
@@ -1033,8 +1030,6 @@ class SendCardState extends State<SendCard> with AutomaticKeepAliveClientMixin<S
         if (current.isEmpty) return;
         if (_justHandledPasteButton || _lastHandledAddress == current) return;
 
-        await output.fetchParsedAddress(context);
-
         // If it's a URI with params, go through URI flow
         if (current.contains('=')) {
           try {

lib/src/screens/send/widgets/send_template_card.dart

@@ -92,11 +92,9 @@ class SendTemplateCard extends StatelessWidget {
                         ],
                         onPushPasteButton: (context) async {
                           template.output.resetParsedAddress();
-                          await template.output.fetchParsedAddress(context);
                         },
                         onPushAddressBookButton: (context) async {
                           template.output.resetParsedAddress();
-                          await template.output.fetchParsedAddress(context);
                         },
                         buttonColor: Theme.of(context).colorScheme.surfaceContainerHighest,
                         textStyle: Theme.of(context).textTheme.bodyMedium!.copyWith(

lib/src/screens/settings/domain_lookups_page.dart

@@ -1,6 +1,7 @@
 import 'package:cake_wallet/generated/i18n.dart';
 import 'package:cake_wallet/src/screens/base_page.dart';
 import 'package:cake_wallet/src/screens/settings/widgets/settings_switcher_cell.dart';
+import 'package:cake_wallet/src/widgets/cake_image_widget.dart';
 import 'package:cake_wallet/view_model/settings/connection_sync_view_model.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_mobx/flutter_mobx.dart';
@@ -20,47 +21,21 @@ class DomainLookupsPage extends BasePage {
         return Container(
           padding: EdgeInsets.only(top: 10),
           child: Column(
-            children: [
-              SettingsSwitcherCell(
-                  title: 'Twitter',
-                  value: _connectionsSyncViewModel.lookupTwitter,
-                  onValueChange: (_, bool value) => _connectionsSyncViewModel.setLookupsTwitter(value)),
-              SettingsSwitcherCell(
-                  title: 'Mastodon',
-                  value: _connectionsSyncViewModel.looksUpMastodon,
-                  onValueChange: (_, bool value) => _connectionsSyncViewModel.setLookupsMastodon(value)),
-              SettingsSwitcherCell(
-                  title: 'Yat service',
-                  value: _connectionsSyncViewModel.looksUpYatService,
-                  onValueChange: (_, bool value) => _connectionsSyncViewModel.setLookupsYatService(value)),
-              SettingsSwitcherCell(
-                  title: 'Unstoppable Domains',
-                  value: _connectionsSyncViewModel.looksUpUnstoppableDomains,
-                  onValueChange: (_, bool value) => _connectionsSyncViewModel.setLookupsUnstoppableDomains(value)),
-              SettingsSwitcherCell(
-                  title: 'OpenAlias',
-                  value: _connectionsSyncViewModel.looksUpOpenAlias,
-                  onValueChange: (_, bool value) => _connectionsSyncViewModel.setLookupsOpenAlias(value)),
-              SettingsSwitcherCell(
-                  title: 'Ethereum Name Service',
-                  value: _connectionsSyncViewModel.looksUpENS,
-                  onValueChange: (_, bool value) => _connectionsSyncViewModel.setLookupsENS(value)),
-              SettingsSwitcherCell(
-                  title: 'Zcash Names',
-                  value: _connectionsSyncViewModel.lookupsZcashNames,
-                  onValueChange: (_, bool value) =>
-                      _connectionsSyncViewModel.setLookupsZcashNames(value)),
-              SettingsSwitcherCell(
-                  title: '.well-known',
-                  value: _connectionsSyncViewModel.looksUpWellKnown,
-                  onValueChange: (_, bool value) => _connectionsSyncViewModel.setLookupsWellKnown(value)),
-              SettingsSwitcherCell(
-                  title: 'Zano Aliases',
-                  value: _connectionsSyncViewModel.lookupsZanoAlias,
-                  onValueChange: (_, bool value) => _connectionsSyncViewModel.setLookupsZanoAlias(value)),
-
-              //if (!isHaven) it does not work correctly
-            ],
+            children: _connectionsSyncViewModel.domainLookupSources
+                .map(
+                  (source) => SettingsSwitcherCell(
+                    title: source.label,
+                    leading: source.iconPath.isNotEmpty ? CakeImageWidget(
+                      imageUrl: source.iconPath,
+                      width: 24,
+                      height: 24,
+                    ) : SizedBox(width: 24, height: 24),
+                    value: _connectionsSyncViewModel.lookupValue(source),
+                    onValueChange: (_, bool value) =>
+                        _connectionsSyncViewModel.setLookupValue(source, value),
+                  ),
+                )
+                .toList(),
           ),
         );
       }),

lib/src/screens/wallet_list/filtered_list.dart

@@ -10,6 +10,7 @@ class FilteredList extends StatefulWidget {
     this.canReorder = true,
     this.shrinkWrap = false,
     this.physics,
+    this.padding,
   });
 
   final ObservableList<dynamic> list;
@@ -18,6 +19,7 @@ class FilteredList extends StatefulWidget {
   final bool canReorder;
   final bool shrinkWrap;
   final ScrollPhysics? physics;
+  final EdgeInsets? padding;
 
   @override
   FilteredListState createState() => FilteredListState();
@@ -48,6 +50,7 @@ class FilteredListState extends State<FilteredList> {
           ),
           shrinkWrap: widget.shrinkWrap,
           physics: widget.physics ?? const BouncingScrollPhysics(),
+          padding: widget.padding,
           itemBuilder: widget.itemBuilder,
           itemCount: widget.list.length,
           onReorder: (int oldIndex, int newIndex) {

lib/src/screens/yat/yat_popup.dart

@@ -1,10 +1,10 @@
+import 'package:cake_wallet/core/address_resolver/yat/yat_store.dart';
 import 'package:cake_wallet/src/screens/yat/widgets/first_introduction.dart';
 import 'package:cake_wallet/src/screens/yat/widgets/second_introduction.dart';
 import 'package:cake_wallet/src/screens/yat/widgets/third_introduction.dart';
 import 'package:cake_wallet/src/screens/yat/widgets/yat_close_button.dart';
 import 'package:cake_wallet/src/widgets/alert_background.dart';
 import 'package:cake_wallet/src/widgets/primary_button.dart';
-import 'package:cake_wallet/store/yat/yat_store.dart';
 import 'package:cake_wallet/view_model/dashboard/dashboard_view_model.dart';
 import 'package:flutter/material.dart';
 import 'package:animate_do/animate_do.dart';

lib/src/widgets/base_alert_dialog.dart

@@ -1,6 +1,7 @@
 import 'dart:ui';
 
 import 'package:auto_size_text/auto_size_text.dart';
+import 'package:cake_wallet/src/widgets/cake_image_widget.dart';
 import 'package:cake_wallet/src/widgets/section_divider.dart';
 import 'package:flutter/material.dart';
 
@@ -184,10 +185,7 @@ class BaseAlertDialog extends StatelessWidget {
         radius: 50,
         backgroundColor: Theme.of(context).colorScheme.surfaceContainerHighest,
         child: ClipOval(
-          child: Image.network(
-            imageUrl,
-            fit: BoxFit.cover,
-          ),
+          child: CakeImageWidget (imageUrl: imageUrl, width: 100, height: 100, fit: BoxFit.cover),
         ),
       ),
     );

lib/src/widgets/bottom_sheet/confirm_sending_bottom_sheet_widget.dart

@@ -163,7 +163,7 @@ class ConfirmSendingBottomSheet extends BaseBottomSheet {
                   itemBuilder: (context, index) {
                     final isBatchSending = outputs.length > 1;
                     final item = outputs[index];
-                    final contactName = item.parsedAddress.name;
+                    final contactName = item.parsedAddress.profileName;
                     final isCakePayName = contactName == 'Cake Pay';
                     final batchContactTitle =
                         '${index + 1}/${outputs.length} - ${contactName.isEmpty ? 'Address' : contactName}';