From 1e8a4359d78ae6144124903ef1b97a0dc796ad2f Mon Sep 17 00:00:00 2001
From: pizzaboxer <pizzaboxer@pizzaboxer.xyz>
Date: Wed, 23 Aug 2023 10:27:30 +0100
Subject: [PATCH] Fix selected menu version not applying (#528)

---
 Bloxstrap/FastFlagManager.cs                  | 19 ++++++++++++++-----
 Bloxstrap/InstallChecker.cs                   |  4 ++++
 .../UI/ViewModels/Menu/FastFlagsViewModel.cs  |  7 +++++--
 3 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/Bloxstrap/FastFlagManager.cs b/Bloxstrap/FastFlagManager.cs
index 3e38a56..72d9c08 100644
--- a/Bloxstrap/FastFlagManager.cs
+++ b/Bloxstrap/FastFlagManager.cs
@@ -42,7 +42,12 @@ namespace Bloxstrap
             { "UI.Menu.GraphicsSlider", "FFlagFixGraphicsQuality" },
             
             { "UI.Menu.Style.DisableV2", "FFlagDisableNewIGMinDUA" },
-            { "UI.Menu.Style.EnableV4", "FFlagEnableInGameMenuControls" }
+            { "UI.Menu.Style.EnableV4", "FFlagEnableInGameMenuControls" },
+
+            { "UI.Menu.Style.ABTest.1", "FFlagEnableMenuControlsABTest" },
+            { "UI.Menu.Style.ABTest.2", "FFlagEnableMenuModernizationABTest" },
+            { "UI.Menu.Style.ABTest.3", "FFlagEnableMenuModernizationABTest2" },
+            { "UI.Menu.Style.ABTest.4", "FFlagEnableV3MenuABTest3" }
         };
 
         // only one missing here is Metal because lol
@@ -81,7 +86,8 @@ namespace Bloxstrap
                 new Dictionary<string, string?>
                 {
                     { "DisableV2", null },
-                    { "EnableV4", null }
+                    { "EnableV4", null },
+                    { "ABTest", null }
                 }
             },
 
@@ -90,7 +96,8 @@ namespace Bloxstrap
                 new Dictionary<string, string?>
                 {
                     { "DisableV2", "True" },
-                    { "EnableV4", "False" }
+                    { "EnableV4", "False" },
+                    { "ABTest", "False" }
                 }
             },
 
@@ -99,7 +106,8 @@ namespace Bloxstrap
                 new Dictionary<string, string?>
                 {
                     { "DisableV2", "False" },
-                    { "EnableV4", "False" }
+                    { "EnableV4", "False" },
+                    { "ABTest", "False" }
                 }
             },
 
@@ -108,7 +116,8 @@ namespace Bloxstrap
                 new Dictionary<string, string?>
                 {
                     { "DisableV2", "True" },
-                    { "EnableV4", "True" }
+                    { "EnableV4", "True" },
+                    { "ABTest", "False" }
                 }
             }
         };
diff --git a/Bloxstrap/InstallChecker.cs b/Bloxstrap/InstallChecker.cs
index a833acb..7e4bb09 100644
--- a/Bloxstrap/InstallChecker.cs
+++ b/Bloxstrap/InstallChecker.cs
@@ -223,6 +223,10 @@ namespace Bloxstrap
                 else if (existingVersionInfo.ProductVersion == "2.5.0")
                 {
                     App.FastFlags.SetValue("FIntDebugForceMSAASamples", null);
+
+                    if (App.FastFlags.GetPreset("UI.Menu.Style.DisableV2") is not null)
+                        App.FastFlags.SetPreset("UI.Menu.Style.ABTest", false);
+
                     App.FastFlags.Save();
                 }
             }
diff --git a/Bloxstrap/UI/ViewModels/Menu/FastFlagsViewModel.cs b/Bloxstrap/UI/ViewModels/Menu/FastFlagsViewModel.cs
index 8b95d0c..8dee2e5 100644
--- a/Bloxstrap/UI/ViewModels/Menu/FastFlagsViewModel.cs
+++ b/Bloxstrap/UI/ViewModels/Menu/FastFlagsViewModel.cs
@@ -101,8 +101,11 @@ namespace Bloxstrap.UI.ViewModels.Menu
 
                     foreach (var flag in version.Value)
                     {
-                        if (App.FastFlags.GetPreset($"UI.Menu.Style.{flag.Key}") != flag.Value)
-                            flagsMatch = false;
+                        foreach (var presetFlag in FastFlagManager.PresetFlags.Where(x => x.Key.StartsWith($"UI.Menu.Style.{flag.Key}")))
+                        { 
+                            if (App.FastFlags.GetValue(presetFlag.Value) != flag.Value)
+                                flagsMatch = false;
+                        }
                     }
 
                     if (flagsMatch)