[TW-1482] Sometime Timestamp is disappear when scrolling (#1502)

linagora · Feb 26, 2024 · 2e5f258 · 2e5f258
1 parent 89fee0e
commit 2e5f258
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -26,7 +26,7 @@ prime
 # The .vscode folder contains launch configuration and tasks you configure in
 # VS Code which you may wish to be included in version control, so this line
 # is commented out by default.
-#.vscode/
+.vscode/
 
 # Flutter/Dart/Pub related
 **/doc/api/

diff --git a/lib/pages/chat/chat.dart b/lib/pages/chat/chat.dart
@@ -1605,21 +1605,26 @@ class ChatController extends State<Chat>
         deltaBottomReversed > viewPortDimension - stickyTimestampHeight;
   }
 
+  Timer? _timestampTimer;
+
   void _handleHideStickyTimestamp() {
     Logs().d('Chat::_handleHideStickyTimestamp() - Hide sticky timestamp');
     stickyTimestampNotifier.value = null;
   }
 
-  void handleScrollEndNotification() async {
+  void handleScrollEndNotification() {
     Logs().d('Chat::handleScrollEndNotification() - End of scroll');
     if (PlatformInfos.isMobile) {
+      _timestampTimer?.cancel();
       _currentChatScrollState = ChatScrollState.endScroll;
-      await Future.delayed(_delayHideStickyTimestampHeader);
-      _handleHideStickyTimestamp();
+      _timestampTimer =
+          Timer(_delayHideStickyTimestampHeader, _handleHideStickyTimestamp);
     }
   }
 
   void handleScrollStartNotification() {
+    Logs().d('Chat::handleScrollStartNotification() - Start of scroll');
+    if (PlatformInfos.isMobile) _timestampTimer?.cancel();
     _currentChatScrollState = ChatScrollState.startScroll;
   }