majro update

app/lib/features/geckoview/domain/controllers/bottom_sheet.g.dart

@@ -13,14 +13,15 @@ String _$bottomSheetControllerHash() =>
 @ProviderFor(BottomSheetController)
 final bottomSheetControllerProvider =
     AutoDisposeNotifierProvider<BottomSheetController, Sheet?>.internal(
-  BottomSheetController.new,
-  name: r'bottomSheetControllerProvider',
-  debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product')
-      ? null
-      : _$bottomSheetControllerHash,
-  dependencies: null,
-  allTransitiveDependencies: null,
-);
+      BottomSheetController.new,
+      name: r'bottomSheetControllerProvider',
+      debugGetCreateSourceHash:
+          const bool.fromEnvironment('dart.vm.product')
+              ? null
+              : _$bottomSheetControllerHash,
+      dependencies: null,
+      allTransitiveDependencies: null,
+    );
 
 typedef _$BottomSheetController = AutoDisposeNotifier<Sheet?>;
 String _$bottomSheetExtendHash() => r'7e11b9047c15bdeb4dfcb488a8573daadb64e25c';
@@ -29,14 +30,15 @@ String _$bottomSheetExtendHash() => r'7e11b9047c15bdeb4dfcb488a8573daadb64e25c';
 @ProviderFor(BottomSheetExtend)
 final bottomSheetExtendProvider =
     StreamNotifierProvider<BottomSheetExtend, double>.internal(
-  BottomSheetExtend.new,
-  name: r'bottomSheetExtendProvider',
-  debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product')
-      ? null
-      : _$bottomSheetExtendHash,
-  dependencies: null,
-  allTransitiveDependencies: null,
-);
+      BottomSheetExtend.new,
+      name: r'bottomSheetExtendProvider',
+      debugGetCreateSourceHash:
+          const bool.fromEnvironment('dart.vm.product')
+              ? null
+              : _$bottomSheetExtendHash,
+      dependencies: null,
+      allTransitiveDependencies: null,
+    );
 
 typedef _$BottomSheetExtend = StreamNotifier<double>;
 // ignore_for_file: type=lint

app/lib/features/geckoview/domain/controllers/overlay.g.dart

@@ -12,14 +12,15 @@ String _$overlayControllerHash() => r'b6dc3ca17611c4efadc7e8248d493cd3c7061e01';
 @ProviderFor(OverlayController)
 final overlayControllerProvider =
     AutoDisposeNotifierProvider<OverlayController, Widget?>.internal(
-  OverlayController.new,
-  name: r'overlayControllerProvider',
-  debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product')
-      ? null
-      : _$overlayControllerHash,
-  dependencies: null,
-  allTransitiveDependencies: null,
-);
+      OverlayController.new,
+      name: r'overlayControllerProvider',
+      debugGetCreateSourceHash:
+          const bool.fromEnvironment('dart.vm.product')
+              ? null
+              : _$overlayControllerHash,
+      dependencies: null,
+      allTransitiveDependencies: null,
+    );
 
 typedef _$OverlayController = AutoDisposeNotifier<Widget?>;
 // ignore_for_file: type=lint

app/lib/features/geckoview/domain/entities/states/tab.g.dart

@@ -106,7 +106,6 @@ class _$TabStateCWProxyImpl implements _$TabStateCWProxy {
       this(findResultState: findResultState);
 
   @override
-
   /// This function **does support** nullification of nullable fields. All `null` values passed to `non-nullable` fields will be ignored. You can also use `TabState(...).copyWith.fieldName(...)` to override fields one at a time with nullification support.
   ///
   /// Usage
@@ -130,58 +129,71 @@ class _$TabStateCWProxyImpl implements _$TabStateCWProxy {
   }) {
     return TabState(
       id: _value.id,
-      contextId: contextId == const $CopyWithPlaceholder()
-          ? _value.contextId
-          // ignore: cast_nullable_to_non_nullable
-          : contextId as String?,
-      url: url == const $CopyWithPlaceholder()
-          ? _value.url
-          // ignore: cast_nullable_to_non_nullable
-          : url as Uri,
-      title: title == const $CopyWithPlaceholder()
-          ? _value.title
-          // ignore: cast_nullable_to_non_nullable
-          : title as String,
-      icon: icon == const $CopyWithPlaceholder()
-          ? _value.icon
-          // ignore: cast_nullable_to_non_nullable
-          : icon as EquatableImage?,
-      thumbnail: thumbnail == const $CopyWithPlaceholder()
-          ? _value.thumbnail
-          // ignore: cast_nullable_to_non_nullable
-          : thumbnail as EquatableImage?,
-      progress: progress == const $CopyWithPlaceholder()
-          ? _value.progress
-          // ignore: cast_nullable_to_non_nullable
-          : progress as int,
-      isPrivate: isPrivate == const $CopyWithPlaceholder()
-          ? _value.isPrivate
-          // ignore: cast_nullable_to_non_nullable
-          : isPrivate as bool,
-      isFullScreen: isFullScreen == const $CopyWithPlaceholder()
-          ? _value.isFullScreen
-          // ignore: cast_nullable_to_non_nullable
-          : isFullScreen as bool,
-      isLoading: isLoading == const $CopyWithPlaceholder()
-          ? _value.isLoading
-          // ignore: cast_nullable_to_non_nullable
-          : isLoading as bool,
-      securityInfoState: securityInfoState == const $CopyWithPlaceholder()
-          ? _value.securityInfoState
-          // ignore: cast_nullable_to_non_nullable
-          : securityInfoState as SecurityState,
-      historyState: historyState == const $CopyWithPlaceholder()
-          ? _value.historyState
-          // ignore: cast_nullable_to_non_nullable
-          : historyState as HistoryState,
-      readerableState: readerableState == const $CopyWithPlaceholder()
-          ? _value.readerableState
-          // ignore: cast_nullable_to_non_nullable
-          : readerableState as ReaderableState,
-      findResultState: findResultState == const $CopyWithPlaceholder()
-          ? _value.findResultState
-          // ignore: cast_nullable_to_non_nullable
-          : findResultState as FindResultState,
+      contextId:
+          contextId == const $CopyWithPlaceholder()
+              ? _value.contextId
+              // ignore: cast_nullable_to_non_nullable
+              : contextId as String?,
+      url:
+          url == const $CopyWithPlaceholder()
+              ? _value.url
+              // ignore: cast_nullable_to_non_nullable
+              : url as Uri,
+      title:
+          title == const $CopyWithPlaceholder()
+              ? _value.title
+              // ignore: cast_nullable_to_non_nullable
+              : title as String,
+      icon:
+          icon == const $CopyWithPlaceholder()
+              ? _value.icon
+              // ignore: cast_nullable_to_non_nullable
+              : icon as EquatableImage?,
+      thumbnail:
+          thumbnail == const $CopyWithPlaceholder()
+              ? _value.thumbnail
+              // ignore: cast_nullable_to_non_nullable
+              : thumbnail as EquatableImage?,
+      progress:
+          progress == const $CopyWithPlaceholder()
+              ? _value.progress
+              // ignore: cast_nullable_to_non_nullable
+              : progress as int,
+      isPrivate:
+          isPrivate == const $CopyWithPlaceholder()
+              ? _value.isPrivate
+              // ignore: cast_nullable_to_non_nullable
+              : isPrivate as bool,
+      isFullScreen:
+          isFullScreen == const $CopyWithPlaceholder()
+              ? _value.isFullScreen
+              // ignore: cast_nullable_to_non_nullable
+              : isFullScreen as bool,
+      isLoading:
+          isLoading == const $CopyWithPlaceholder()
+              ? _value.isLoading
+              // ignore: cast_nullable_to_non_nullable
+              : isLoading as bool,
+      securityInfoState:
+          securityInfoState == const $CopyWithPlaceholder()
+              ? _value.securityInfoState
+              // ignore: cast_nullable_to_non_nullable
+              : securityInfoState as SecurityState,
+      historyState:
+          historyState == const $CopyWithPlaceholder()
+              ? _value.historyState
+              // ignore: cast_nullable_to_non_nullable
+              : historyState as HistoryState,
+      readerableState:
+          readerableState == const $CopyWithPlaceholder()
+              ? _value.readerableState
+              // ignore: cast_nullable_to_non_nullable
+              : readerableState as ReaderableState,
+      findResultState:
+          findResultState == const $CopyWithPlaceholder()
+              ? _value.findResultState
+              // ignore: cast_nullable_to_non_nullable
+              : findResultState as FindResultState,
     );
   }
 }

app/lib/features/geckoview/domain/entities/states/web_extension.g.dart

@@ -69,7 +69,6 @@ class _$WebExtensionStateCWProxyImpl implements _$WebExtensionStateCWProxy {
   WebExtensionState icon(EquatableImage? icon) => this(icon: icon);
 
   @override
-
   /// This function **does support** nullification of nullable fields. All `null` values passed to `non-nullable` fields will be ignored. You can also use `WebExtensionState(...).copyWith.fieldName(...)` to override fields one at a time with nullification support.
   ///
   /// Usage
@@ -86,34 +85,41 @@ class _$WebExtensionStateCWProxyImpl implements _$WebExtensionStateCWProxy {
     Object? icon = const $CopyWithPlaceholder(),
   }) {
     return WebExtensionState(
-      extensionId: extensionId == const $CopyWithPlaceholder()
-          ? _value.extensionId
-          // ignore: cast_nullable_to_non_nullable
-          : extensionId as String,
-      enabled: enabled == const $CopyWithPlaceholder()
-          ? _value.enabled
-          // ignore: cast_nullable_to_non_nullable
-          : enabled as bool,
-      title: title == const $CopyWithPlaceholder()
-          ? _value.title
-          // ignore: cast_nullable_to_non_nullable
-          : title as String?,
-      badgeText: badgeText == const $CopyWithPlaceholder()
-          ? _value.badgeText
-          // ignore: cast_nullable_to_non_nullable
-          : badgeText as String?,
-      badgeTextColor: badgeTextColor == const $CopyWithPlaceholder()
-          ? _value.badgeTextColor
-          // ignore: cast_nullable_to_non_nullable
-          : badgeTextColor as Color?,
-      badgeBackgroundColor: badgeBackgroundColor == const $CopyWithPlaceholder()
-          ? _value.badgeBackgroundColor
-          // ignore: cast_nullable_to_non_nullable
-          : badgeBackgroundColor as Color?,
-      icon: icon == const $CopyWithPlaceholder()
-          ? _value.icon
-          // ignore: cast_nullable_to_non_nullable
-          : icon as EquatableImage?,
+      extensionId:
+          extensionId == const $CopyWithPlaceholder()
+              ? _value.extensionId
+              // ignore: cast_nullable_to_non_nullable
+              : extensionId as String,
+      enabled:
+          enabled == const $CopyWithPlaceholder()
+              ? _value.enabled
+              // ignore: cast_nullable_to_non_nullable
+              : enabled as bool,
+      title:
+          title == const $CopyWithPlaceholder()
+              ? _value.title
+              // ignore: cast_nullable_to_non_nullable
+              : title as String?,
+      badgeText:
+          badgeText == const $CopyWithPlaceholder()
+              ? _value.badgeText
+              // ignore: cast_nullable_to_non_nullable
+              : badgeText as String?,
+      badgeTextColor:
+          badgeTextColor == const $CopyWithPlaceholder()
+              ? _value.badgeTextColor
+              // ignore: cast_nullable_to_non_nullable
+              : badgeTextColor as Color?,
+      badgeBackgroundColor:
+          badgeBackgroundColor == const $CopyWithPlaceholder()
+              ? _value.badgeBackgroundColor
+              // ignore: cast_nullable_to_non_nullable
+              : badgeBackgroundColor as Color?,
+      icon:
+          icon == const $CopyWithPlaceholder()
+              ? _value.icon
+              // ignore: cast_nullable_to_non_nullable
+              : icon as EquatableImage?,
     );
   }
 }

app/lib/features/geckoview/domain/providers.dart

@@ -3,6 +3,7 @@ import 'dart:async';
 import 'package:flutter_mozilla_components/flutter_mozilla_components.dart';
 import 'package:lensai/core/logger.dart';
 import 'package:lensai/features/bangs/domain/providers/bangs.dart';
+import 'package:lensai/features/geckoview/domain/providers/selected_tab.dart';
 import 'package:lensai/features/geckoview/domain/repositories/tab.dart';
 import 'package:riverpod/riverpod.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
@@ -23,26 +24,31 @@ GeckoSelectionActionService selectionActionService(Ref ref) {
         );
 
         if (defaultSearchBang != null) {
-          await ref
-              .read(tabRepositoryProvider.notifier)
-              .addTab(url: defaultSearchBang.getUrl(text));
-        } else {
-          logger.e('No default search bang found');
-        }
-      }),
-      PrivateSearchAction((text) async {
-        final defaultSearchBang = await ref.read(
-          defaultSearchBangDataProvider.future,
-        );
+          final currentTabId = ref.read(selectedTabProvider);
 
-        if (defaultSearchBang != null) {
           await ref
               .read(tabRepositoryProvider.notifier)
-              .addTab(url: defaultSearchBang.getUrl(text), private: true);
+              .addTab(
+                url: defaultSearchBang.getUrl(text),
+                parentId: currentTabId,
+              );
         } else {
           logger.e('No default search bang found');
         }
       }),
+      // PrivateSearchAction((text) async {
+      //   final defaultSearchBang = await ref.read(
+      //     defaultSearchBangDataProvider.future,
+      //   );
+
+      //   if (defaultSearchBang != null) {
+      //     await ref
+      //         .read(tabRepositoryProvider.notifier)
+      //         .addTab(url: defaultSearchBang.getUrl(text), private: true);
+      //   } else {
+      //     logger.e('No default search bang found');
+      //   }
+      // }),
       ShareAction((text) async {
         await Share.share(text);
       }),

app/lib/features/geckoview/domain/providers.g.dart

@@ -7,20 +7,21 @@ part of 'providers.dart';
 // **************************************************************************
 
 String _$selectionActionServiceHash() =>
-    r'd0c04262171976c21441297706273417e3d79b67';
+    r'8d0af53213bdb924bcf5f8df6ceec6c81a345345';
 
 /// See also [selectionActionService].
 @ProviderFor(selectionActionService)
 final selectionActionServiceProvider =
     Provider<GeckoSelectionActionService>.internal(
-  selectionActionService,
-  name: r'selectionActionServiceProvider',
-  debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product')
-      ? null
-      : _$selectionActionServiceHash,
-  dependencies: null,
-  allTransitiveDependencies: null,
-);
+      selectionActionService,
+      name: r'selectionActionServiceProvider',
+      debugGetCreateSourceHash:
+          const bool.fromEnvironment('dart.vm.product')
+              ? null
+              : _$selectionActionServiceHash,
+      dependencies: null,
+      allTransitiveDependencies: null,
+    );
 
 @Deprecated('Will be removed in 3.0. Use Ref instead')
 // ignore: unused_element
@@ -64,9 +65,10 @@ String _$tabContentServiceHash() => r'd9a991add907ecc138c62790883e59d8e9aa9266';
 final tabContentServiceProvider = Provider<GeckoTabContentService>.internal(
   tabContentService,
   name: r'tabContentServiceProvider',
-  debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product')
-      ? null
-      : _$tabContentServiceHash,
+  debugGetCreateSourceHash:
+      const bool.fromEnvironment('dart.vm.product')
+          ? null
+          : _$tabContentServiceHash,
   dependencies: null,
   allTransitiveDependencies: null,
 );
@@ -81,14 +83,15 @@ String _$engineSuggestionsServiceHash() =>
 @ProviderFor(engineSuggestionsService)
 final engineSuggestionsServiceProvider =
     Provider<GeckoSuggestionsService>.internal(
-  engineSuggestionsService,
-  name: r'engineSuggestionsServiceProvider',
-  debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product')
-      ? null
-      : _$engineSuggestionsServiceHash,
-  dependencies: null,
-  allTransitiveDependencies: null,
-);
+      engineSuggestionsService,
+      name: r'engineSuggestionsServiceProvider',
+      debugGetCreateSourceHash:
+          const bool.fromEnvironment('dart.vm.product')
+              ? null
+              : _$engineSuggestionsServiceHash,
+      dependencies: null,
+      allTransitiveDependencies: null,
+    );
 
 @Deprecated('Will be removed in 3.0. Use Ref instead')
 // ignore: unused_element
@@ -99,14 +102,15 @@ String _$engineReadyStateHash() => r'c682333e2e07cf0635aa7ae793a2088ca648c950';
 @ProviderFor(EngineReadyState)
 final engineReadyStateProvider =
     NotifierProvider<EngineReadyState, bool>.internal(
-  EngineReadyState.new,
-  name: r'engineReadyStateProvider',
-  debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product')
-      ? null
-      : _$engineReadyStateHash,
-  dependencies: null,
-  allTransitiveDependencies: null,
-);
+      EngineReadyState.new,
+      name: r'engineReadyStateProvider',
+      debugGetCreateSourceHash:
+          const bool.fromEnvironment('dart.vm.product')
+              ? null
+              : _$engineReadyStateHash,
+      dependencies: null,
+      allTransitiveDependencies: null,
+    );
 
 typedef _$EngineReadyState = Notifier<bool>;
 // ignore_for_file: type=lint

app/lib/features/geckoview/domain/providers/selected_tab.dart

@@ -21,7 +21,7 @@ class SelectedTab extends _$SelectedTab {
       }
     });
 
-    final selectedTabSub = eventSerivce.selectedTabEvents.listen((tabId) async {
+    final selectedTabSub = eventSerivce.selectedTabEvents.listen((tabId) {
       state = tabId;
     });
 

app/lib/features/geckoview/domain/providers/selected_tab.g.dart

@@ -6,7 +6,7 @@ part of 'selected_tab.dart';
 // RiverpodGenerator
 // **************************************************************************
 
-String _$selectedTabHash() => r'f550ac5b471bab8f8e5d75ef4d7669cde769db9a';
+String _$selectedTabHash() => r'250f54fe9a56d14876e0979e5370eb76879da11c';
 
 /// See also [SelectedTab].
 @ProviderFor(SelectedTab)

app/lib/features/geckoview/domain/providers/tab_list.dart

@@ -22,7 +22,7 @@ class TabList extends _$TabList {
       }
     });
 
-    final tabListSub = eventService.tabListEvents.listen((tabs) async {
+    final tabListSub = eventService.tabListEvents.listen((tabs) {
       final equatableTabs = EquatableCollection(tabs, immutable: true);
 
       if (equatableTabs != state) {

app/lib/features/geckoview/domain/providers/tab_list.g.dart

@@ -6,19 +6,19 @@ part of 'tab_list.dart';
 // RiverpodGenerator
 // **************************************************************************
 
-String _$tabListHash() => r'bb8b6cca42a8aace8bd9808fdeac4fe4965ac867';
+String _$tabListHash() => r'cdcbfd9c12e06f350d8284d48c81826b3aa57b6d';
 
 /// See also [TabList].
 @ProviderFor(TabList)
 final tabListProvider =
     NotifierProvider<TabList, EquatableCollection<List<String>>>.internal(
-  TabList.new,
-  name: r'tabListProvider',
-  debugGetCreateSourceHash:
-      const bool.fromEnvironment('dart.vm.product') ? null : _$tabListHash,
-  dependencies: null,
-  allTransitiveDependencies: null,
-);
+      TabList.new,
+      name: r'tabListProvider',
+      debugGetCreateSourceHash:
+          const bool.fromEnvironment('dart.vm.product') ? null : _$tabListHash,
+      dependencies: null,
+      allTransitiveDependencies: null,
+    );
 
 typedef _$TabList = Notifier<EquatableCollection<List<String>>>;
 // ignore_for_file: type=lint

app/lib/features/geckoview/domain/providers/tab_session.g.dart

@@ -13,14 +13,15 @@ String _$selectedTabSessionNotifierHash() =>
 @ProviderFor(selectedTabSessionNotifier)
 final selectedTabSessionNotifierProvider =
     AutoDisposeProvider<Raw<TabSession>>.internal(
-  selectedTabSessionNotifier,
-  name: r'selectedTabSessionNotifierProvider',
-  debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product')
-      ? null
-      : _$selectedTabSessionNotifierHash,
-  dependencies: null,
-  allTransitiveDependencies: null,
-);
+      selectedTabSessionNotifier,
+      name: r'selectedTabSessionNotifierProvider',
+      debugGetCreateSourceHash:
+          const bool.fromEnvironment('dart.vm.product')
+              ? null
+              : _$selectedTabSessionNotifierHash,
+      dependencies: null,
+      allTransitiveDependencies: null,
+    );
 
 @Deprecated('Will be removed in 3.0. Use Ref instead')
 // ignore: unused_element
@@ -51,9 +52,7 @@ class _SystemHash {
 abstract class _$TabSession extends BuildlessAutoDisposeNotifier<void> {
   late final String? tabId;
 
-  void build({
-    required String? tabId,
-  });
+  void build({required String? tabId});
 }
 
 /// See also [TabSession].
@@ -66,21 +65,15 @@ class TabSessionFamily extends Family<void> {
   const TabSessionFamily();
 
   /// See also [TabSession].
-  TabSessionProvider call({
-    required String? tabId,
-  }) {
-    return TabSessionProvider(
-      tabId: tabId,
-    );
+  TabSessionProvider call({required String? tabId}) {
+    return TabSessionProvider(tabId: tabId);
   }
 
   @override
   TabSessionProvider getProviderOverride(
     covariant TabSessionProvider provider,
   ) {
-    return call(
-      tabId: provider.tabId,
-    );
+    return call(tabId: provider.tabId);
   }
 
   static const Iterable<ProviderOrFamily>? _dependencies = null;
@@ -102,21 +95,19 @@ class TabSessionFamily extends Family<void> {
 class TabSessionProvider
     extends AutoDisposeNotifierProviderImpl<TabSession, void> {
   /// See also [TabSession].
-  TabSessionProvider({
-    required String? tabId,
-  }) : this._internal(
-          () => TabSession()..tabId = tabId,
-          from: tabSessionProvider,
-          name: r'tabSessionProvider',
-          debugGetCreateSourceHash:
-              const bool.fromEnvironment('dart.vm.product')
-                  ? null
-                  : _$tabSessionHash,
-          dependencies: TabSessionFamily._dependencies,
-          allTransitiveDependencies:
-              TabSessionFamily._allTransitiveDependencies,
-          tabId: tabId,
-        );
+  TabSessionProvider({required String? tabId})
+    : this._internal(
+        () => TabSession()..tabId = tabId,
+        from: tabSessionProvider,
+        name: r'tabSessionProvider',
+        debugGetCreateSourceHash:
+            const bool.fromEnvironment('dart.vm.product')
+                ? null
+                : _$tabSessionHash,
+        dependencies: TabSessionFamily._dependencies,
+        allTransitiveDependencies: TabSessionFamily._allTransitiveDependencies,
+        tabId: tabId,
+      );
 
   TabSessionProvider._internal(
     super._createNotifier, {
@@ -131,12 +122,8 @@ class TabSessionProvider
   final String? tabId;
 
   @override
-  void runNotifierBuild(
-    covariant TabSession notifier,
-  ) {
-    return notifier.build(
-      tabId: tabId,
-    );
+  void runNotifierBuild(covariant TabSession notifier) {
+    return notifier.build(tabId: tabId);
   }
 
   @override
@@ -189,5 +176,6 @@ class _TabSessionProviderElement
   @override
   String? get tabId => (origin as TabSessionProvider).tabId;
 }
+
 // ignore_for_file: type=lint
 // ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package

app/lib/features/geckoview/domain/providers/tab_state.dart

@@ -126,7 +126,7 @@ class TabStates extends _$TabStates {
     final eventService = ref.watch(eventServiceProvider);
 
     final subscriptions = [
-      eventService.tabContentEvents.listen((event) async {
+      eventService.tabContentEvents.listen((event) {
         _onTabContentStateChange(event);
       }),
       eventService.iconChangeEvents.listen((event) async {
@@ -135,16 +135,16 @@ class TabStates extends _$TabStates {
       eventService.thumbnailEvents.listen((event) async {
         await _onThumbnailChange(event);
       }),
-      eventService.securityInfoEvents.listen((event) async {
+      eventService.securityInfoEvents.listen((event) {
         _onSecurityInfoStateChange(event);
       }),
-      eventService.historyEvents.listen((event) async {
+      eventService.historyEvents.listen((event) {
         _onHistoryStateChange(event);
       }),
-      eventService.readerableEvents.listen((event) async {
+      eventService.readerableEvents.listen((event) {
         _onReaderableStateChange(event);
       }),
-      eventService.findResultsEvent.listen((event) async {
+      eventService.findResultsEvent.listen((event) {
         _onFindResultsChange(event);
       }),
     ];

app/lib/features/geckoview/domain/providers/tab_state.g.dart

@@ -39,21 +39,13 @@ class TabStateFamily extends Family<TabState?> {
   const TabStateFamily();
 
   /// See also [tabState].
-  TabStateProvider call(
-    String? tabId,
-  ) {
-    return TabStateProvider(
-      tabId,
-    );
+  TabStateProvider call(String? tabId) {
+    return TabStateProvider(tabId);
   }
 
   @override
-  TabStateProvider getProviderOverride(
-    covariant TabStateProvider provider,
-  ) {
-    return call(
-      provider.tabId,
-    );
+  TabStateProvider getProviderOverride(covariant TabStateProvider provider) {
+    return call(provider.tabId);
   }
 
   static const Iterable<ProviderOrFamily>? _dependencies = null;
@@ -74,23 +66,19 @@ class TabStateFamily extends Family<TabState?> {
 /// See also [tabState].
 class TabStateProvider extends AutoDisposeProvider<TabState?> {
   /// See also [tabState].
-  TabStateProvider(
-    String? tabId,
-  ) : this._internal(
-          (ref) => tabState(
-            ref as TabStateRef,
-            tabId,
-          ),
-          from: tabStateProvider,
-          name: r'tabStateProvider',
-          debugGetCreateSourceHash:
-              const bool.fromEnvironment('dart.vm.product')
-                  ? null
-                  : _$tabStateHash,
-          dependencies: TabStateFamily._dependencies,
-          allTransitiveDependencies: TabStateFamily._allTransitiveDependencies,
-          tabId: tabId,
-        );
+  TabStateProvider(String? tabId)
+    : this._internal(
+        (ref) => tabState(ref as TabStateRef, tabId),
+        from: tabStateProvider,
+        name: r'tabStateProvider',
+        debugGetCreateSourceHash:
+            const bool.fromEnvironment('dart.vm.product')
+                ? null
+                : _$tabStateHash,
+        dependencies: TabStateFamily._dependencies,
+        allTransitiveDependencies: TabStateFamily._allTransitiveDependencies,
+        tabId: tabId,
+      );
 
   TabStateProvider._internal(
     super._createNotifier, {
@@ -105,9 +93,7 @@ class TabStateProvider extends AutoDisposeProvider<TabState?> {
   final String? tabId;
 
   @override
-  Override overrideWith(
-    TabState? Function(TabStateRef provider) create,
-  ) {
+  Override overrideWith(TabState? Function(TabStateRef provider) create) {
     return ProviderOverride(
       origin: this,
       override: TabStateProvider._internal(
@@ -163,9 +149,10 @@ String _$selectedTabStateHash() => r'dbd36af7af286bd9d079f30e8e11bbda23bf7728';
 final selectedTabStateProvider = AutoDisposeProvider<TabState?>.internal(
   selectedTabState,
   name: r'selectedTabStateProvider',
-  debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product')
-      ? null
-      : _$selectedTabStateHash,
+  debugGetCreateSourceHash:
+      const bool.fromEnvironment('dart.vm.product')
+          ? null
+          : _$selectedTabStateHash,
   dependencies: null,
   allTransitiveDependencies: null,
 );
@@ -173,19 +160,21 @@ final selectedTabStateProvider = AutoDisposeProvider<TabState?>.internal(
 @Deprecated('Will be removed in 3.0. Use Ref instead')
 // ignore: unused_element
 typedef SelectedTabStateRef = AutoDisposeProviderRef<TabState?>;
-String _$tabStatesHash() => r'2f4af9df4d648f7fb940f02e14f4a6762bb21d8a';
+String _$tabStatesHash() => r'b136dbf6d68b67f0fe0db302a4147b67789db853';
 
 /// See also [TabStates].
 @ProviderFor(TabStates)
 final tabStatesProvider =
     NotifierProvider<TabStates, Map<String, TabState>>.internal(
-  TabStates.new,
-  name: r'tabStatesProvider',
-  debugGetCreateSourceHash:
-      const bool.fromEnvironment('dart.vm.product') ? null : _$tabStatesHash,
-  dependencies: null,
-  allTransitiveDependencies: null,
-);
+      TabStates.new,
+      name: r'tabStatesProvider',
+      debugGetCreateSourceHash:
+          const bool.fromEnvironment('dart.vm.product')
+              ? null
+              : _$tabStatesHash,
+      dependencies: null,
+      allTransitiveDependencies: null,
+    );
 
 typedef _$TabStates = Notifier<Map<String, TabState>>;
 // ignore_for_file: type=lint

app/lib/features/geckoview/domain/providers/web_extensions_state.dart

@@ -69,7 +69,7 @@ class WebExtensionsState extends _$WebExtensionsState {
 
     final subscriptions = switch (actionType) {
       WebExtensionActionType.browser => [
-        addonService.browserExtensionStream.listen((event) async {
+        addonService.browserExtensionStream.listen((event) {
           _onExtensionUpdate(event);
         }),
         addonService.browserIconStream.listen((event) async {
@@ -77,7 +77,7 @@ class WebExtensionsState extends _$WebExtensionsState {
         }),
       ],
       WebExtensionActionType.page => [
-        addonService.pageExtensionStream.listen((event) async {
+        addonService.pageExtensionStream.listen((event) {
           _onExtensionUpdate(event);
         }),
         addonService.pageIconStream.listen((event) async {

app/lib/features/geckoview/domain/providers/web_extensions_state.g.dart

@@ -7,7 +7,7 @@ part of 'web_extensions_state.dart';
 // **************************************************************************
 
 String _$webExtensionsStateHash() =>
-    r'9382461e7e72c31946a5308642baaac307977a15';
+    r'eab924e9c17e805a3c29065289be5d1c8ffe3bc9';
 
 /// Copied from Dart SDK
 class _SystemHash {
@@ -34,9 +34,7 @@ abstract class _$WebExtensionsState
     extends BuildlessNotifier<Map<String, WebExtensionState>> {
   late final WebExtensionActionType actionType;
 
-  Map<String, WebExtensionState> build(
-    WebExtensionActionType actionType,
-  );
+  Map<String, WebExtensionState> build(WebExtensionActionType actionType);
 }
 
 /// See also [WebExtensionsState].
@@ -49,21 +47,15 @@ class WebExtensionsStateFamily extends Family<Map<String, WebExtensionState>> {
   const WebExtensionsStateFamily();
 
   /// See also [WebExtensionsState].
-  WebExtensionsStateProvider call(
-    WebExtensionActionType actionType,
-  ) {
-    return WebExtensionsStateProvider(
-      actionType,
-    );
+  WebExtensionsStateProvider call(WebExtensionActionType actionType) {
+    return WebExtensionsStateProvider(actionType);
   }
 
   @override
   WebExtensionsStateProvider getProviderOverride(
     covariant WebExtensionsStateProvider provider,
   ) {
-    return call(
-      provider.actionType,
-    );
+    return call(provider.actionType);
   }
 
   static const Iterable<ProviderOrFamily>? _dependencies = null;
@@ -82,24 +74,27 @@ class WebExtensionsStateFamily extends Family<Map<String, WebExtensionState>> {
 }
 
 /// See also [WebExtensionsState].
-class WebExtensionsStateProvider extends NotifierProviderImpl<
-    WebExtensionsState, Map<String, WebExtensionState>> {
+class WebExtensionsStateProvider
+    extends
+        NotifierProviderImpl<
+          WebExtensionsState,
+          Map<String, WebExtensionState>
+        > {
   /// See also [WebExtensionsState].
-  WebExtensionsStateProvider(
-    WebExtensionActionType actionType,
-  ) : this._internal(
-          () => WebExtensionsState()..actionType = actionType,
-          from: webExtensionsStateProvider,
-          name: r'webExtensionsStateProvider',
-          debugGetCreateSourceHash:
-              const bool.fromEnvironment('dart.vm.product')
-                  ? null
-                  : _$webExtensionsStateHash,
-          dependencies: WebExtensionsStateFamily._dependencies,
-          allTransitiveDependencies:
-              WebExtensionsStateFamily._allTransitiveDependencies,
-          actionType: actionType,
-        );
+  WebExtensionsStateProvider(WebExtensionActionType actionType)
+    : this._internal(
+        () => WebExtensionsState()..actionType = actionType,
+        from: webExtensionsStateProvider,
+        name: r'webExtensionsStateProvider',
+        debugGetCreateSourceHash:
+            const bool.fromEnvironment('dart.vm.product')
+                ? null
+                : _$webExtensionsStateHash,
+        dependencies: WebExtensionsStateFamily._dependencies,
+        allTransitiveDependencies:
+            WebExtensionsStateFamily._allTransitiveDependencies,
+        actionType: actionType,
+      );
 
   WebExtensionsStateProvider._internal(
     super._createNotifier, {
@@ -117,9 +112,7 @@ class WebExtensionsStateProvider extends NotifierProviderImpl<
   Map<String, WebExtensionState> runNotifierBuild(
     covariant WebExtensionsState notifier,
   ) {
-    return notifier.build(
-      actionType,
-    );
+    return notifier.build(actionType);
   }
 
   @override
@@ -140,7 +133,7 @@ class WebExtensionsStateProvider extends NotifierProviderImpl<
 
   @override
   NotifierProviderElement<WebExtensionsState, Map<String, WebExtensionState>>
-      createElement() {
+  createElement() {
     return _WebExtensionsStateProviderElement(this);
   }
 
@@ -167,14 +160,19 @@ mixin WebExtensionsStateRef
   WebExtensionActionType get actionType;
 }
 
-class _WebExtensionsStateProviderElement extends NotifierProviderElement<
-    WebExtensionsState,
-    Map<String, WebExtensionState>> with WebExtensionsStateRef {
+class _WebExtensionsStateProviderElement
+    extends
+        NotifierProviderElement<
+          WebExtensionsState,
+          Map<String, WebExtensionState>
+        >
+    with WebExtensionsStateRef {
   _WebExtensionsStateProviderElement(super.provider);
 
   @override
   WebExtensionActionType get actionType =>
       (origin as WebExtensionsStateProvider).actionType;
 }
+
 // ignore_for_file: type=lint
 // ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package

app/lib/features/geckoview/domain/repositories/tab.dart

@@ -140,7 +140,7 @@ class TabRepository extends _$TabRepository {
     final tabStateDebouncer = Debouncer(const Duration(seconds: 3));
     Map<String, TabState>? debounceStartValue;
 
-    ref.listen(tabStatesProvider, (previous, next) async {
+    ref.listen(tabStatesProvider, (previous, next) {
       //Since state changes occure pretty often and our map always contains
       //the latest state, we cache the value before starting debouncing and
       //later diff to that, to avoid frequent database writes

app/lib/features/geckoview/domain/repositories/tab.g.dart

@@ -6,16 +6,17 @@ part of 'tab.dart';
 // RiverpodGenerator
 // **************************************************************************
 
-String _$tabRepositoryHash() => r'f7d6584d9d6a320ebe4964dd5dc80bda987c40c2';
+String _$tabRepositoryHash() => r'e6f9d58982f3bbe389e3a3299bb498c6e8e101eb';
 
 /// See also [TabRepository].
 @ProviderFor(TabRepository)
 final tabRepositoryProvider = NotifierProvider<TabRepository, void>.internal(
   TabRepository.new,
   name: r'tabRepositoryProvider',
-  debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product')
-      ? null
-      : _$tabRepositoryHash,
+  debugGetCreateSourceHash:
+      const bool.fromEnvironment('dart.vm.product')
+          ? null
+          : _$tabRepositoryHash,
   dependencies: null,
   allTransitiveDependencies: null,
 );