From 4066cb7a54f7ba8f516979fb42df9b61f0df5b65 Mon Sep 17 00:00:00 2001
From: Erik Bylund <kirre.bylund@gmail.com>
Date: Thu, 26 Feb 2026 13:55:00 +0100
Subject: [PATCH] fix: Remove references to live env (and also stage env)

---
 ...LootLockerAdminExtension.Authentication.cs | 20 ++----
 .../LootLockerAdminExtension.EventHandlers.cs |  8 +--
 ...LootLockerAdminExtension.GameManagement.cs |  4 +-
 .../Editor UI/LootLockerAdminExtension.UI.cs  | 39 +-----------
 .../Editor UI/LootLockerAdminExtension.cs     | 61 -------------------
 .../Editor UI/LootLockerAdminExtension.uxml   | 11 +---
 Runtime/Editor/LootLockerEditorData.cs        | 17 ------
 Runtime/Game/Resources/LootLockerConfig.cs    |  4 +-
 8 files changed, 14 insertions(+), 150 deletions(-)

diff --git a/Runtime/Editor/Editor UI/LootLockerAdminExtension.Authentication.cs b/Runtime/Editor/Editor UI/LootLockerAdminExtension.Authentication.cs
index 8429ffd1c..a7ce5ab63 100644
--- a/Runtime/Editor/Editor UI/LootLockerAdminExtension.Authentication.cs	
+++ b/Runtime/Editor/Editor UI/LootLockerAdminExtension.Authentication.cs	
@@ -133,20 +133,15 @@ private void ProcessUserInformation(LoginResponse response)
         void CreateNewAPIKey()
         {
             int gameId = LootLockerEditorData.GetSelectedGame();
-            if (gameId == 0)
+            if (gameId == 0 || !gameData.ContainsKey(gameId))
             {
                 ShowPopup("Error", "No active Game found!");
                 return;
             }
 
-            if (isStage && gameData.ContainsKey(gameId))
-            {
-                gameId = gameData[gameId].development.id;
-            }
-
             ShowLoadingAndExecute(() =>
             {
-                LootLockerAdminManager.GenerateKey(gameId, newApiKeyName.value, "game", (onComplete) =>
+                LootLockerAdminManager.GenerateKey(gameData[gameId].development.id, newApiKeyName.value, "game", (onComplete) =>
                 {
                     if (!onComplete.success)
                     {
@@ -168,16 +163,15 @@ public void RefreshAPIKeys()
             if (apiKeyList != null) apiKeyList.Clear();
             
             int gameID = LootLockerEditorData.GetSelectedGame();
-            if (isStage && gameData.ContainsKey(gameID))
+            if (gameID == 0 || !gameData.ContainsKey(gameID))
             {
-                gameID = gameData[gameID].development.id;
+                ShowPopup("Error", "No active Game found!");
+                return;
             }
-            
-            isLoadingKeys = true;
 
             ShowLoadingAndExecute(() =>
             {
-                LootLockerAdminManager.GetAllKeys(gameID, (onComplete) =>
+                LootLockerAdminManager.GetAllKeys(gameData[gameID].development.id, (onComplete) =>
                 {
                     if (!onComplete.success)
                     {
@@ -190,8 +184,6 @@ public void RefreshAPIKeys()
                     {
                         APIKeyTemplate(key);
                     }
-
-                    isLoadingKeys = false;
                     HideLoading();
                 });
             });
diff --git a/Runtime/Editor/Editor UI/LootLockerAdminExtension.EventHandlers.cs b/Runtime/Editor/Editor UI/LootLockerAdminExtension.EventHandlers.cs
index 0f9eee00c..32a995ca3 100644
--- a/Runtime/Editor/Editor UI/LootLockerAdminExtension.EventHandlers.cs	
+++ b/Runtime/Editor/Editor UI/LootLockerAdminExtension.EventHandlers.cs	
@@ -67,9 +67,6 @@ private void OnGameSelected(EventBase e)
             gameName.text = selectedGameData.name;
             UpdateLicenseCountdownUI();
 
-            LootLockerEditorData.SetEnvironmentStage();
-            isStage = true;
-
             ShowLoadingAndExecute(() =>
             {
                 LootLockerAdminManager.GetGameDomainKey(LootLockerEditorData.GetSelectedGame(), (onComplete) =>
@@ -96,7 +93,7 @@ private void OnAPIKeySelected(EventBase e)
 
             LootLockerConfig.current.apiKey = target.name;
             SwapNewSelectedKey();
-            ShowPopup("API Key Selected", $"API Key {target.name} is now active.");
+            ShowPopup("API Key Selected", $"API Key {target.name} is now active.", Color.green);
         }
 
         private void LicenseCountdownIconClick(MouseDownEvent evt)
@@ -125,9 +122,10 @@ private void OnEditorUpdate()
             EditorApplication.QueuePlayerLoopUpdate();
         }
 
-        private void ShowPopup(string title, string message)
+        private void ShowPopup(string title, string message, Color? titleColor = null)
         {
             if (popupTitle != null) popupTitle.text = title;
+            if (titleColor.HasValue && popupTitle != null) popupTitle.style.color = titleColor.Value;
             if (popupMessage != null) popupMessage.text = message;
             if (popup != null) popup.style.display = DisplayStyle.Flex;
         }
diff --git a/Runtime/Editor/Editor UI/LootLockerAdminExtension.GameManagement.cs b/Runtime/Editor/Editor UI/LootLockerAdminExtension.GameManagement.cs
index 34af49375..810e669b3 100644
--- a/Runtime/Editor/Editor UI/LootLockerAdminExtension.GameManagement.cs	
+++ b/Runtime/Editor/Editor UI/LootLockerAdminExtension.GameManagement.cs	
@@ -72,7 +72,7 @@ void APIKeyTemplate(KeyResponse key)
             if (button.name == LootLockerConfig.current.apiKey)
             {
                 button.style.borderRightColor = button.style.borderLeftColor = 
-                    button.style.borderTopColor = button.style.borderBottomColor = stage;
+                    button.style.borderTopColor = button.style.borderBottomColor = new Color(0.094f, 0.749f, 0.352f, 1);
                 button.style.backgroundColor = new StyleColor(new Color(0.2f, 0.5f, 0.2f, 1f));
             }
             
@@ -106,7 +106,7 @@ void SwapNewSelectedKey()
                 if (key.name == LootLockerConfig.current.apiKey)
                 {
                     key.style.borderRightColor = key.style.borderLeftColor = 
-                        key.style.borderTopColor = key.style.borderBottomColor = stage;
+                        key.style.borderTopColor = key.style.borderBottomColor = new Color(0.094f, 0.749f, 0.352f, 1);
                     key.style.backgroundColor = new StyleColor(new Color(0.2f, 0.5f, 0.2f, 1f));
                 }
                 else
diff --git a/Runtime/Editor/Editor UI/LootLockerAdminExtension.UI.cs b/Runtime/Editor/Editor UI/LootLockerAdminExtension.UI.cs
index 11d782c2d..011c0da39 100644
--- a/Runtime/Editor/Editor UI/LootLockerAdminExtension.UI.cs	
+++ b/Runtime/Editor/Editor UI/LootLockerAdminExtension.UI.cs	
@@ -32,7 +32,7 @@ public void InitializeUIElements()
             if (visualTree == null)
             {
                 // Try to load from Packages
-                visualTree = EditorGUIUtility.Load("Packages/com.lootlocker.lootlockersdk/Runtime/Editor UI/LootLockerAdminExtension.uxml") as VisualTreeAsset;
+                visualTree = EditorGUIUtility.Load("Packages/com.lootlocker.lootlockersdk/Runtime/Editor/Editor UI/LootLockerAdminExtension.uxml") as VisualTreeAsset;
             }
             if (visualTree == null)
             {
@@ -53,7 +53,6 @@ public void InitializeUIElements()
             InitializeStyleColors();
             InitializeUIReferences(root);
             InitializeEventHandlers();
-            InitializeEnvironmentUI();
             InitializeLoadingIcon(root);
             InitializeLicenseCountdownUI(root);
         }
@@ -69,19 +68,11 @@ private void CreateSecurityWarning(VisualElement root)
 
         private void InitializeStyleColors()
         {
-            live.value = new Color(0.749f, 0.325f, 0.098f, 1);
-            stage.value = new Color(0.094f, 0.749f, 0.352f, 1);
             defaultButton.value = new Color(0.345f, 0.345f, 0.345f, 1);
         }
 
         private void InitializeUIReferences(VisualElement root)
         {
-            // Environment
-            environmentBackground = root.Q<VisualElement>("SwitchBackground");
-            environmentHandle = root.Q<VisualElement>("Handle");
-            environmentElement = root.Q<VisualElement>("Environment");
-            environmentTitle = root.Q<Label>("EnvironmentTitle");
-
             // Basic UI elements
             gameName = root.Q<Label>("GameName");
             menu = root.Q<VisualElement>("MenuBar");
@@ -157,7 +148,6 @@ private void InitializeUIReferences(VisualElement root)
         private void SetInitialDisplayStates()
         {
             if (menuLogoutBtn != null) menuLogoutBtn.style.display = DisplayStyle.None;
-            if (environmentElement != null) environmentElement.style.display = DisplayStyle.None;
             if (menu != null) menu.style.display = DisplayStyle.None;
             if (loginFlow != null) loginFlow.style.display = DisplayStyle.None;
             if (mfaFlow != null) mfaFlow.style.display = DisplayStyle.None;
@@ -169,9 +159,6 @@ private void SetInitialDisplayStates()
 
         private void InitializeEventHandlers()
         {
-            // Environment switcher
-            if (environmentBackground != null) environmentBackground.AddManipulator(new Clickable(evt => SwapEnvironment()));
-            if (environmentHandle != null) environmentHandle.AddManipulator(new Clickable(evt => SwapEnvironment()));
 
             // Menu buttons
             if (menuLogoutBtn != null) menuLogoutBtn.clickable.clicked += ConfirmLogout;
@@ -215,14 +202,6 @@ private void InitializeSettingsEventHandlers()
             if (allowTokenRefreshToggle != null) allowTokenRefreshToggle.RegisterValueChangedCallback(evt => SaveAllowTokenRefresh(evt.newValue));
         }
 
-        private void InitializeEnvironmentUI()
-        {
-            if (environmentBackground != null) environmentBackground.tooltip = "Stage";
-            
-            isStage = LootLockerEditorData.IsEnvironmentStage();
-            UpdateEnvironmentUI();
-        }
-
         private void InitializeLoadingIcon(VisualElement root)
         {
             loadingPage = root.Q<VisualElement>("LoadingBackground");
@@ -261,22 +240,6 @@ private void InitializeLicenseCountdownUI(VisualElement root)
             if (licenseCountdownContainer != null) licenseCountdownContainer.style.display = DisplayStyle.None;
         }
 
-        public void UpdateEnvironmentUI()
-        {
-            if (isStage)
-            {
-                if (environmentHandle != null) environmentHandle.style.alignSelf = Align.FlexStart;
-                if (environmentBackground != null) environmentBackground.style.backgroundColor = stage;
-                if (environmentTitle != null) environmentTitle.text = "Environment: Stage";
-            }
-            else
-            {
-                if (environmentHandle != null) environmentHandle.style.alignSelf = Align.FlexEnd;
-                if (environmentBackground != null) environmentBackground.style.backgroundColor = live;
-                if (environmentTitle != null) environmentTitle.text = "Environment: Live";
-            }
-        }
-
         public void SetupSettingsButton()
         {
             if (settingsBtn != null)
diff --git a/Runtime/Editor/Editor UI/LootLockerAdminExtension.cs b/Runtime/Editor/Editor UI/LootLockerAdminExtension.cs
index 35039753f..61727a0fd 100644
--- a/Runtime/Editor/Editor UI/LootLockerAdminExtension.cs	
+++ b/Runtime/Editor/Editor UI/LootLockerAdminExtension.cs	
@@ -12,8 +12,6 @@ namespace LootLocker.Extension
     public partial class LootLockerAdminExtension : EditorWindow
     {
         #region State Variables
-        private bool isStage = true;
-        private bool isLoadingKeys = false;
         private Dictionary<int, LootLocker.Extension.DataTypes.Game> gameData = new Dictionary<int, LootLocker.Extension.DataTypes.Game>();
         private DateTime gameDataRefreshTime;
         private readonly int gameDataCacheExpirationTimeMinutes = 1;
@@ -30,8 +28,6 @@ public partial class LootLockerAdminExtension : EditorWindow
 
         #region Style Colors
         [Header("Colors")]
-        private StyleColor stage;
-        private StyleColor live;
         private StyleColor defaultButton;
         #endregion
 
@@ -40,11 +36,6 @@ public partial class LootLockerAdminExtension : EditorWindow
         private Label gameName;
         private Label securityWarning;
 
-        // Environment
-        private VisualElement environmentBackground, environmentHandle;
-        private VisualElement environmentElement;
-        private Label environmentTitle;
-
         // Flows
         private VisualElement activeFlow;
         private VisualElement loginFlow, mfaFlow, gameSelectorFlow, apiKeyFlow, settingsFlow;
@@ -163,42 +154,6 @@ public void CreateGUI()
         #endregion
 
         #region Flow Management
-        private bool IsStageOnlyGame()
-        {
-            int selectedGameId = LootLockerEditorData.GetSelectedGame();
-            if (!gameData.ContainsKey(selectedGameId)) return false;
-            var game = gameData[selectedGameId];
-            if (game.created_at == default(System.DateTime) || game.created_at == null) return false;
-            var cutoff = new System.DateTime(2025, 3, 10);
-            return game.created_at >= cutoff;
-        }        void SwapEnvironment()
-        {
-            if (isLoadingKeys)
-            {
-                if (popup != null && popupTitle != null && popupMessage != null)
-                {
-                    popupTitle.text = "Error";
-                    popupMessage.text = "Please wait...";
-                    popup.style.display = DisplayStyle.Flex;
-                }
-                if (loadingPage != null) loadingPage.style.display = DisplayStyle.None;
-                return;
-            }
-
-            isStage = !isStage;
-            RefreshAPIKeys();
-
-            if (isStage)
-            {
-                LootLockerEditorData.SetEnvironmentStage();
-            }
-            else
-            {
-                LootLockerEditorData.SetEnvironmentLive();
-            }
-
-            UpdateEnvironmentUI();
-        }
 
         void SwapFlows(VisualElement newFlow)
         {
@@ -257,7 +212,6 @@ private void ConfigureGameSelectorFlow()
             if (emailField != null) emailField.value = "";
             if (passwordField != null) passwordField.value = "";
             SetMenuVisibility(apiKey: false, changeGame: false, logout: true);
-            if (environmentElement != null) environmentElement.style.display = DisplayStyle.None;
             if (createApiKeyWindow != null) createApiKeyWindow.style.display = DisplayStyle.None;
             CreateGameButtons();
         }
@@ -270,20 +224,6 @@ private void ConfigureApiKeyFlow()
             SetMenuVisibility(apiKey: true, changeGame: true, logout: true);
             if (createApiKeyWindow != null) createApiKeyWindow.style.display = DisplayStyle.Flex;
 
-            // Show environment switcher only for non-stage-only games
-            if (environmentElement != null && environmentBackground != null && environmentHandle != null && environmentTitle != null)
-            {
-                if (!IsStageOnlyGame())
-                {
-                    environmentElement.style.display = DisplayStyle.Flex;
-                    environmentBackground.style.display = DisplayStyle.Flex;
-                    environmentHandle.style.display = DisplayStyle.Flex;
-                }
-                else
-                {
-                    environmentElement.style.display = DisplayStyle.None;
-                }
-            }
             RefreshAPIKeys();
         }
 
@@ -292,7 +232,6 @@ private void ConfigureSettingsFlow()
             if (settingsBtn != null) settingsBtn.style.display = DisplayStyle.Flex;
             if (licenseCountdownContainer != null) licenseCountdownContainer.style.display = DisplayStyle.None;
             SetMenuVisibility(apiKey: true, changeGame: true, logout: true);
-            if (environmentElement != null) environmentElement.style.display = DisplayStyle.None;
             if (createApiKeyWindow != null) createApiKeyWindow.style.display = DisplayStyle.None;
             LoadSettingsUI();
         }
diff --git a/Runtime/Editor/Editor UI/LootLockerAdminExtension.uxml b/Runtime/Editor/Editor UI/LootLockerAdminExtension.uxml
index 58611450e..ee689c140 100644
--- a/Runtime/Editor/Editor UI/LootLockerAdminExtension.uxml	
+++ b/Runtime/Editor/Editor UI/LootLockerAdminExtension.uxml	
@@ -3,16 +3,7 @@
             <ui:Label tabindex="-1" text="LootLocker" display-tooltip-when-elided="true" name="GameName" style="align-items: flex-start; align-self: center; font-size: 28px; -unity-text-align: middle-left; text-overflow: clip; width: auto; white-space: nowrap; max-width: 750px; margin-left: 24px; justify-content: flex-start;" />
             <ui:VisualElement name="LicenseCountdownContainer" style="flex-direction: row; align-items: center; align-self: center; margin-left: 12px;">
                 <ui:Label name="LicenseCountdownLabel" text="" style="font-size: 14px; color: rgb(255, 200, 0); margin-right: 4px; display: none;" />
-                <ui:Image name="LicenseCountdownIcon" style="width: 16px; height: 16px; display: none; cursor: link;" />            </ui:VisualElement>            
-            <ui:VisualElement style="flex-grow: 1; flex-direction: row; align-items: center; justify-content: flex-end;">                <ui:VisualElement name="Environment" style="flex-grow: 0; flex-direction: row; flex-shrink: 1; align-self: center; justify-content: flex-end; margin-right: 8px; align-items: center;">
-                    <ui:Label tabindex="-1" text="Environment: Stage" display-tooltip-when-elided="true" name="EnvironmentTitle" style="align-items: flex-start; align-self: center; font-size: 14px; -unity-text-align: middle-left; text-overflow: clip; white-space: nowrap; margin-right: 8px;" />
-                    <ui:VisualElement name="SwitchBackground" class="environmentToStageBackground" style="flex-grow: 1; background-color: rgb(28, 232, 109); min-width: 40px; min-height: 26px; border-top-left-radius: 12px; border-top-right-radius: 12px; border-bottom-right-radius: 12px; border-bottom-left-radius: 12px; align-items: auto; align-self: center; max-width: 80px; justify-content: center; flex-shrink: 0;">
-                        <ui:VisualElement name="Handle" style="flex-grow: 1; background-color: rgb(255, 255, 255); align-self: flex-start; align-items: flex-end; justify-content: flex-start; border-top-left-radius: 90px; border-top-right-radius: 90px; border-bottom-right-radius: 90px; border-bottom-left-radius: 90px; margin-right: 4px; margin-left: 4px; flex-shrink: 0; width: 20px; height: 20px; min-width: 20px; min-height: 20px; max-height: 20px; max-width: 20px; margin-top: 0;" />
-                    </ui:VisualElement>                </ui:VisualElement>
-                <ui:VisualElement name="SettingsContainer" style="flex-direction: row; align-items: center; align-self: center; margin-right: 24px;">
-                    <ui:Button name="SettingsBtn" tooltip="Settings" style="width: 28px; height: 28px; align-self: center; background-color: rgba(60, 60, 60, 0); border-width: 1px; border-color: rgba(100,100,100,0.0); border-radius: 0px; font-size: 18px; cursor: link; display: none; color: rgb(200,200,200);" />
-                </ui:VisualElement>
-            </ui:VisualElement>
+                <ui:Image name="LicenseCountdownIcon" style="width: 16px; height: 16px; display: none; cursor: link;" />            </ui:VisualElement>
         </ui:VisualElement>
         <ui:VisualElement name="ContentView" style="flex-grow: 1; background-color: rgba(0, 0, 0, 0); margin-top: 0; opacity: 1; bottom: 0; top: 0; height: 100%;">
             <ui:VisualElement name="MenuBar" style="flex-grow: 0; flex-shrink: 0; visibility: visible; display: flex; border-bottom-width: 2px; border-bottom-color: rgb(46, 46, 46); flex-direction: row; justify-content: flex-start; align-self: auto; align-items: center; margin-left: 0; margin-bottom: 12px; min-height: 40px;">
diff --git a/Runtime/Editor/LootLockerEditorData.cs b/Runtime/Editor/LootLockerEditorData.cs
index 76b8b3dea..6c65f4600 100644
--- a/Runtime/Editor/LootLockerEditorData.cs
+++ b/Runtime/Editor/LootLockerEditorData.cs
@@ -11,7 +11,6 @@ public class LootLockerEditorData
         private static string adminToken = prefix + "AdminToken";
         private static string selectedGameID = prefix + "SelectedGameID";
         private static string selectedGameName = prefix + "SelectedGameName";
-        private static string environment = prefix + "Environment";
         private static string firstTimeWelcome = prefix + "FirstTimeWelcome";
         private static string newSession = prefix + "NewSession";
 
@@ -20,7 +19,6 @@ public static void ClearLootLockerPrefs()
             EditorPrefs.DeleteKey(adminToken);
             EditorPrefs.DeleteKey(selectedGameID);
             EditorPrefs.DeleteKey(selectedGameName);
-            EditorPrefs.DeleteKey(environment);
             EditorPrefs.DeleteKey(firstTimeWelcome);
             EditorPrefs.DeleteKey(newSession);
         }
@@ -56,21 +54,6 @@ public static string GetSelectedGameName()
             return EditorPrefs.GetString(selectedGameName);
         }
 
-        public static void SetEnvironmentStage()
-        {
-            EditorPrefs.SetString(environment, "Stage");
-        }
-
-        public static void SetEnvironmentLive()
-        {
-            EditorPrefs.SetString(environment, "Live");
-        }
-
-        public static bool IsEnvironmentStage()
-        {
-            return EditorPrefs.GetString(environment).Equals("Stage");
-        }
-
         public static bool ShouldAutoShowWindow()
         {
             var result = EditorPrefs.GetBool(firstTimeWelcome, true);
diff --git a/Runtime/Game/Resources/LootLockerConfig.cs b/Runtime/Game/Resources/LootLockerConfig.cs
index 548756679..eae45084c 100644
--- a/Runtime/Game/Resources/LootLockerConfig.cs
+++ b/Runtime/Game/Resources/LootLockerConfig.cs
@@ -415,9 +415,7 @@ public static LootLockerConfig current
         [HideInInspector] private static readonly string WssProtocol = "wss://";
         [HideInInspector] private static readonly string UrlCore = "api.lootlocker.com";
         [HideInInspector] private static string UrlCoreOverride =
-#if LOOTLOCKER_TARGET_STAGE_ENV
-           "api.stage.internal.dev.lootlocker.cloud";
-#elif LOOTLOCKER_TARGET_LOCAL_ENV
+#if LOOTLOCKER_TARGET_LOCAL_ENV
            "localhost:8080";
 #else
             null;