From bf9a7d3a7fe40f1e2f0fcf8cf9fda45e3cfb2ded Mon Sep 17 00:00:00 2001
From: HarukiToreda <116696711+HarukiToreda@users.noreply.github.com>
Date: Thu, 10 Apr 2025 02:22:53 -0400
Subject: [PATCH] Scroll on message screen restarts on visit

---
 src/graphics/Screen.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/graphics/Screen.cpp b/src/graphics/Screen.cpp
index 118a40dee..3223dcc17 100644
--- a/src/graphics/Screen.cpp
+++ b/src/graphics/Screen.cpp
@@ -1325,6 +1325,14 @@ void drawTextMessageFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16
     static uint32_t lastTime = 0, scrollStartDelay = 0, pauseStart = 0;
     static bool waitingToReset = false, scrollStarted = false;
 
+    // === Reset scroll state when entering screen ===
+    if (state->ticksSinceLastStateSwitch == 0) {
+        scrollY = 0;
+        scrollStartDelay = now;
+        lastTime = now;
+        waitingToReset = false;
+        scrollStarted = false;
+    }
     // === Smooth scrolling adjustment ===
     // You can tweak this divisor to change how smooth it scrolls.
     // Lower = smoother, but can feel slow.