Resolve merge conflict

2025-10-29 17:40:28 +00:00 · 2022-02-27 12:46:19 -06:00
parent d2edc0bffe bfde308492
commit e608c61ba5
12 changed files with 279 additions and 39 deletions
--- a/mobile/lib/modules/search/ui/search_bar.dart
+++ b/mobile/lib/modules/search/ui/search_bar.dart
@@ -27,6 +27,10 @@ class SearchBar extends HookConsumerWidget with PreferredSizeWidget {
        focusNode: searchFocusNode,
        autofocus: false,
        onTap: () {
+<<<<<<< HEAD
+=======
+          ref.watch(searchPageStateProvider.notifier).getSuggestedSearchTerms();
+>>>>>>> bfde3084924e247bc8f7004babf38605fe341a18
          ref.watch(searchPageStateProvider.notifier).enableSearch();
          searchFocusNode.requestFocus();
        },