From 3e07d4c419983b6014cbe51e7762397073016b54 Mon Sep 17 00:00:00 2001
From: C R E S T <217463890+imCrest@users.noreply.github.com>
Date: Tue, 14 Apr 2026 19:00:20 +0530
Subject: [PATCH] Refactor SPOTLIGHT_5TH_TAB_ENABLED property override

---
 .../core/features/impl/ConfigurationOverride.kt             | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/core/src/main/kotlin/me/eternal/purrfectsnap/core/features/impl/ConfigurationOverride.kt b/core/src/main/kotlin/me/eternal/purrfectsnap/core/features/impl/ConfigurationOverride.kt
index 715fa180..a9d66f63 100644
--- a/core/src/main/kotlin/me/eternal/purrfectsnap/core/features/impl/ConfigurationOverride.kt
+++ b/core/src/main/kotlin/me/eternal/purrfectsnap/core/features/impl/ConfigurationOverride.kt
@@ -1,6 +1,7 @@
 package me.eternal.purrfectsnap.core.features.impl
 
 import me.eternal.purrfectsnap.core.features.Feature
+import me.eternal.purrfectsnap.core.features.impl.messaging.Messaging
 
 import me.eternal.purrfectsnap.core.util.hook.HookStage
 import me.eternal.purrfectsnap.core.util.hook.Hooker
@@ -165,7 +166,10 @@ class ConfigurationOverride : Feature("Configuration Override") {
 
             overrideProperty("DF_VOPERA_FOR_STORIES", { context.config.userInterface.verticalStoryViewer.get() },
                 { true }, isAppExperiment = true)
-            overrideProperty("SPOTLIGHT_5TH_TAB_ENABLED", { context.config.userInterface.disableSpotlight.get() },
+            overrideProperty("SPOTLIGHT_5TH_TAB_ENABLED", {
+                context.config.userInterface.disableSpotlight.get() &&
+                    context.feature(Messaging::class).openedConversationUUID == null
+            },
                 { false })
 
             overrideProperty("BYPASS_AD_FEATURE_GATE", { context.config.global.blockAds.get() },