[Settings]Fix ColorPicker dashboard shortcut (#37547)

* Fix color picker dashboard shortcut * remove not needed code * Remove comment
microsoft · Feb 24, 2025 · 744316c · 744316c
1 parent f237091
commit 744316c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 10 deletions.
diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/ColorPickerPage.xaml.cs b/src/settings-ui/Settings.UI/SettingsXAML/Views/ColorPickerPage.xaml.cs
@@ -31,7 +31,7 @@ public ColorPickerPage()
             ViewModel = new ColorPickerViewModel(
                 settingsUtils,
                 SettingsRepository<GeneralSettings>.GetInstance(settingsUtils),
-                null,
+                SettingsRepository<ColorPickerSettings>.GetInstance(settingsUtils),
                 ShellPage.SendDefaultIPCMessage);
             DataContext = ViewModel;
             InitializeComponent();

diff --git a/src/settings-ui/Settings.UI/ViewModels/ColorPickerViewModel.cs b/src/settings-ui/Settings.UI/ViewModels/ColorPickerViewModel.cs
@@ -57,15 +57,7 @@ public ColorPickerViewModel(
 
             _settingsUtils = settingsUtils ?? throw new ArgumentNullException(nameof(settingsUtils));
 
-            if (colorPickerSettingsRepository == null)
-            {
-                // used in release. This method converts the settings stored in the previous form, so we have forwards compatibility
-                _colorPickerSettings = _settingsUtils.GetSettingsOrDefault<ColorPickerSettings, ColorPickerSettingsVersion1>(ColorPickerSettings.ModuleName, settingsUpgrader: ColorPickerSettings.UpgradeSettings);
-            }
-            else
-            {
-                _colorPickerSettings = colorPickerSettingsRepository.SettingsConfig; // used in the unit tests
-            }
+            _colorPickerSettings = colorPickerSettingsRepository.SettingsConfig;
 
             InitializeEnabledValue();