From 9ad7d3905135b8f8f75d541226a006f1530c70fc Mon Sep 17 00:00:00 2001
From: HarukiToreda <116696711+HarukiToreda@users.noreply.github.com>
Date: Fri, 19 Dec 2025 03:54:10 -0500
Subject: [PATCH] Make Tips show after first boot if the region is Unset

---
 .../InkHUD/Applets/System/Tips/TipsApplet.cpp | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/graphics/niche/InkHUD/Applets/System/Tips/TipsApplet.cpp b/src/graphics/niche/InkHUD/Applets/System/Tips/TipsApplet.cpp
index a159bd517..abaf00465 100644
--- a/src/graphics/niche/InkHUD/Applets/System/Tips/TipsApplet.cpp
+++ b/src/graphics/niche/InkHUD/Applets/System/Tips/TipsApplet.cpp
@@ -12,25 +12,27 @@ InkHUD::TipsApplet::TipsApplet()
 {
     bool needsRegion = (config.lora.region == meshtastic_Config_LoRaConfig_RegionCode_UNSET);
 
+    bool showTutorialTips = (settings->tips.firstBoot || needsRegion);
+
     // Welcome screen
-    if (settings->tips.firstBoot)
+    if (showTutorialTips)
         tipQueue.push_back(Tip::WELCOME);
 
-    // Finish setup (info only, not picker)
+    // Finish setup
     if (needsRegion)
         tipQueue.push_back(Tip::FINISH_SETUP);
 
+    // Using the UI
+    if (showTutorialTips) {
+        tipQueue.push_back(Tip::CUSTOMIZATION);
+        tipQueue.push_back(Tip::BUTTONS);
+    }
+
     // Shutdown info
     // Shown until user performs one valid shutdown
     if (!settings->tips.safeShutdownSeen)
         tipQueue.push_back(Tip::SAFE_SHUTDOWN);
 
-    // Using the UI
-    if (settings->tips.firstBoot) {
-        tipQueue.push_back(Tip::CUSTOMIZATION);
-        tipQueue.push_back(Tip::BUTTONS);
-    }
-
     // Catch an incorrect attempt at rotating display
     if (config.display.flip_screen)
         tipQueue.push_back(Tip::ROTATION);
@@ -253,6 +255,7 @@ void InkHUD::TipsApplet::onBackground()
 // While our SystemApplet::handleInput flag is true
 void InkHUD::TipsApplet::onButtonShortPress()
 {
+    bool needsRegion = (config.lora.region == meshtastic_Config_LoRaConfig_RegionCode_UNSET);
     // If we're prompting the user to pick a region, hand off to the menu
     if (!tipQueue.empty() && tipQueue.front() == Tip::PICK_REGION) {
         tipQueue.pop_front();
@@ -272,7 +275,7 @@ void InkHUD::TipsApplet::onButtonShortPress()
     if (tipQueue.empty()) {
         // Record that user has now seen the "tutorial" set of tips
         // Don't show them on subsequent boots
-        if (settings->tips.firstBoot) {
+        if (settings->tips.firstBoot && !needsRegion) {
             settings->tips.firstBoot = false;
             inkhud->persistence->saveSettings();
         }
@@ -280,10 +283,7 @@ void InkHUD::TipsApplet::onButtonShortPress()
         // Close applet and clean the screen
         sendToBackground();
         inkhud->forceUpdate(EInk::UpdateTypes::FULL);
-    }
-
-    // More tips left
-    else {
+    } else {
         requestUpdate();
     }
 }