From ecd81988c1d14f12f4a1b760b737329a2a71569b Mon Sep 17 00:00:00 2001
From: ThomasSession <thomas.r@getsession.org>
Date: Wed, 14 Jan 2026 14:35:27 +1100
Subject: [PATCH 1/2] SES-5105 - Make sure the debug loading state is also used
 for pro stats

---
 app/build.gradle.kts                              |  3 +--
 .../prosettings/ProSettingsViewModel.kt           | 15 ++++++++++++---
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index df16c9b7cd..1b2ad16aba 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -190,11 +190,10 @@ android {
             enableUnitTestCoverage = false
             signingConfig = signingConfigs.getByName("debug")
 
-            applicationIdSuffix = ".${name}"
             enablePermissiveNetworkSecurityConfig(true)
             devNetDefaultOn(false)
             setAlternativeAppName("Session Debug")
-            setAuthorityPostfix(".debug")
+            setAuthorityPostfix("")
         }
     }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/preferences/prosettings/ProSettingsViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/preferences/prosettings/ProSettingsViewModel.kt
index d1711f0c11..5a35b2a58b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/preferences/prosettings/ProSettingsViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/preferences/prosettings/ProSettingsViewModel.kt
@@ -47,6 +47,7 @@ import org.session.libsession.utilities.TextSecurePreferences
 import org.session.libsession.utilities.withMutableUserConfigs
 import org.session.libsignal.utilities.Log
 import org.thoughtcrime.securesms.debugmenu.DebugLogGroup
+import org.thoughtcrime.securesms.debugmenu.DebugMenuViewModel
 import org.thoughtcrime.securesms.preferences.prosettings.ProSettingsViewModel.Commands.ShowOpenUrlDialog
 import org.thoughtcrime.securesms.pro.ProDataState
 import org.thoughtcrime.securesms.pro.ProDetailsRepository
@@ -850,10 +851,18 @@ class ProSettingsViewModel @AssistedInject constructor(
 
     private fun refreshProStats(){
         viewModelScope.launch {
+            // if we have a debug toggle for the loading state, respect it
+            val currentDebugState = prefs.getDebugProPlanStatus()
+            val debugState = when(currentDebugState) {
+                DebugMenuViewModel.DebugProPlanStatus.LOADING -> State.Loading
+                DebugMenuViewModel.DebugProPlanStatus.ERROR -> State.Error(Exception())
+                else -> null
+            }
+
             // show a loader for the stats
             _proSettingsUIState.update {
                 it.copy(
-                    proStats = State.Loading
+                    proStats = debugState ?: State.Loading
                 )
             }
 
@@ -882,14 +891,14 @@ class ProSettingsViewModel @AssistedInject constructor(
 
                 // update ui with results
                 _proSettingsUIState.update {
-                    it.copy(proStats = State.Success(stats))
+                    it.copy(proStats = debugState ?: State.Success(stats))
                 }
             } catch (e: Exception) {
                 // currently the UI doesn't have an error display
                 // it will look like it's still loading
                 // but the logic is there in case we have a look for stats errors
                 _proSettingsUIState.update {
-                    it.copy(proStats = State.Error(e))
+                    it.copy(proStats = debugState ?: State.Error(e))
                 }
             }
         }

From 8ccab4a5ce87a7e022a2abb8e7ed282dba1a3e17 Mon Sep 17 00:00:00 2001
From: ThomasSession <thomas.r@getsession.org>
Date: Wed, 14 Jan 2026 14:36:58 +1100
Subject: [PATCH 2/2] Undoing test setup

---
 app/build.gradle.kts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 1b2ad16aba..df16c9b7cd 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -190,10 +190,11 @@ android {
             enableUnitTestCoverage = false
             signingConfig = signingConfigs.getByName("debug")
 
+            applicationIdSuffix = ".${name}"
             enablePermissiveNetworkSecurityConfig(true)
             devNetDefaultOn(false)
             setAlternativeAppName("Session Debug")
-            setAuthorityPostfix("")
+            setAuthorityPostfix(".debug")
         }
     }