From c8c4abedcb69ca3dbe3e467f55ea0dda685eeadf Mon Sep 17 00:00:00 2001
From: Ashutosh Khadse <128621280+AshutoshKhadse23@users.noreply.github.com>
Date: Thu, 9 Jan 2025 02:04:04 +0530
Subject: [PATCH 1/4] Update with Necessary changes in file autocomplete.dart
 and removed unnecessary changes

---
 lib/widgets/autocomplete.dart | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/lib/widgets/autocomplete.dart b/lib/widgets/autocomplete.dart
index a1e5289b01..29c6cc03e4 100644
--- a/lib/widgets/autocomplete.dart
+++ b/lib/widgets/autocomplete.dart
@@ -33,6 +33,7 @@ abstract class AutocompleteField<QueryT extends AutocompleteQuery, ResultT exten
 
 class _AutocompleteFieldState<QueryT extends AutocompleteQuery, ResultT extends AutocompleteResult> extends State<AutocompleteField<QueryT, ResultT>> with PerAccountStoreAwareStateMixin<AutocompleteField<QueryT, ResultT>> {
   AutocompleteView<QueryT, ResultT>? _viewModel;
+  final ScrollController _scrollController = ScrollController();
 
   void _initViewModel(QueryT query) {
     _viewModel = widget.initViewModel(context, query)
@@ -57,7 +58,13 @@ class _AutocompleteFieldState<QueryT extends AutocompleteQuery, ResultT extends
         _initViewModel(newQuery);
       } else {
         assert(_viewModel!.acceptsQuery(newQuery));
+        final oldQuery = _viewModel!.query;
         _viewModel!.query = newQuery;
+        // Reset scroll when query content changes
+        if (oldQuery.toString() != newQuery.toString() &&
+            _scrollController.hasClients) {
+          _scrollController.jumpTo(0);
+        }
       }
     }
   }
@@ -91,6 +98,7 @@ class _AutocompleteFieldState<QueryT extends AutocompleteQuery, ResultT extends
   void dispose() {
     widget.controller.removeListener(_handleControllerChange);
     _viewModel?.dispose(); // removes our listener
+    _scrollController.dispose();
     super.dispose();
   }
 
@@ -133,6 +141,7 @@ class _AutocompleteFieldState<QueryT extends AutocompleteQuery, ResultT extends
             child: ConstrainedBox(
               constraints: const BoxConstraints(maxHeight: 300), // TODO not hard-coded
               child: ListView.builder(
+                controller: _scrollController,
                 padding: EdgeInsets.zero,
                 shrinkWrap: true,
                 itemCount: _resultsToDisplay.length,

From ff2689faada5492ca9a3c09daaf1541cd2b3aad8 Mon Sep 17 00:00:00 2001
From: Ashutosh Khadse <128621280+AshutoshKhadse23@users.noreply.github.com>
Date: Mon, 31 Mar 2025 17:20:43 +0530
Subject: [PATCH 2/4] Resolve confusion of .toString

---
 lib/widgets/autocomplete.dart | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/widgets/autocomplete.dart b/lib/widgets/autocomplete.dart
index 29c6cc03e4..955b1995fa 100644
--- a/lib/widgets/autocomplete.dart
+++ b/lib/widgets/autocomplete.dart
@@ -61,8 +61,7 @@ class _AutocompleteFieldState<QueryT extends AutocompleteQuery, ResultT extends
         final oldQuery = _viewModel!.query;
         _viewModel!.query = newQuery;
         // Reset scroll when query content changes
-        if (oldQuery.toString() != newQuery.toString() &&
-            _scrollController.hasClients) {
+        if (_scrollController.hasClients) {
           _scrollController.jumpTo(0);
         }
       }

From 0f4b8ff9b75ff668b4dfca93d951262f6e02eb3b Mon Sep 17 00:00:00 2001
From: Ashutosh Khadse <128621280+AshutoshKhadse23@users.noreply.github.com>
Date: Mon, 31 Mar 2025 21:09:41 +0530
Subject: [PATCH 3/4] Fixed tools/check analyze error

---
 lib/widgets/app.dart | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/widgets/app.dart b/lib/widgets/app.dart
index d251b88b58..d5279b1885 100644
--- a/lib/widgets/app.dart
+++ b/lib/widgets/app.dart
@@ -114,9 +114,9 @@ class ZulipApp extends StatefulWidget {
 
     final localizations = ZulipLocalizations.of(navigatorKey.currentContext!);
     final newSnackBar = scaffoldMessenger!.showSnackBar(
-      snackBarAnimationStyle: AnimationStyle(
-        duration: const Duration(milliseconds: 200),
-        reverseDuration: const Duration(milliseconds: 50)),
+      snackBarAnimationStyle: const AnimationStyle(
+        duration: Duration(milliseconds: 200),
+        reverseDuration: Duration(milliseconds: 50)),
       SnackBar(
         content: Text(message),
         action: (details == null) ? null : SnackBarAction(

From 7b26e8e2f73a9804f897b9657ec05648f759f5bd Mon Sep 17 00:00:00 2001
From: Ashutosh Khadse <128621280+AshutoshKhadse23@users.noreply.github.com>
Date: Tue, 1 Apr 2025 09:26:09 +0530
Subject: [PATCH 4/4] Removed unnecessary declaration

---
 lib/widgets/autocomplete.dart | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/widgets/autocomplete.dart b/lib/widgets/autocomplete.dart
index 7cf5063c0c..cfa2bd3885 100644
--- a/lib/widgets/autocomplete.dart
+++ b/lib/widgets/autocomplete.dart
@@ -63,7 +63,6 @@ class _AutocompleteFieldState<QueryT extends AutocompleteQuery, ResultT extends
         _initViewModel(newQuery);
       } else {
         assert(_viewModel!.acceptsQuery(newQuery));
-        final oldQuery = _viewModel!.query;
         _viewModel!.query = newQuery;
         // Reset scroll when query content changes
         if (_scrollController.hasClients) {