From 612d3d6adf6fe0e820deb619f5ef7e806b714c64 Mon Sep 17 00:00:00 2001
From: ggurdin <46800240+ggurdin@users.noreply.github.com>
Date: Fri, 9 Jan 2026 14:01:01 -0500
Subject: [PATCH] fix: use canonical activity time in display for completed
 activity (#5164)

---
 lib/pages/chat_list/chat_list.dart                | 1 -
 lib/pangea/vocab_practice/vocab_timer_widget.dart | 3 +++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/pages/chat_list/chat_list.dart b/lib/pages/chat_list/chat_list.dart
index 2231372ca..d0f2d8948 100644
--- a/lib/pages/chat_list/chat_list.dart
+++ b/lib/pages/chat_list/chat_list.dart
@@ -43,7 +43,6 @@ import '../../widgets/matrix.dart';
 import 'package:fluffychat/utils/tor_stub.dart'
     if (dart.library.html) 'package:tor_detector_web/tor_detector_web.dart';
 
-
 enum PopupMenuAction {
   settings,
   invite,
diff --git a/lib/pangea/vocab_practice/vocab_timer_widget.dart b/lib/pangea/vocab_practice/vocab_timer_widget.dart
index 9f949bd5c..2ef4d06af 100644
--- a/lib/pangea/vocab_practice/vocab_timer_widget.dart
+++ b/lib/pangea/vocab_practice/vocab_timer_widget.dart
@@ -64,6 +64,9 @@ class VocabTimerWidgetState extends State<VocabTimerWidget> {
   }
 
   int _getCurrentSeconds() {
+    if (!_stopwatch.isRunning) {
+      return widget.initialSeconds;
+    }
     return _initialSeconds + (_stopwatch.elapsedMilliseconds / 1000).round();
   }