diff --git a/src/settings-ui/Settings.UI/SettingsXAML/Views/ColorPickerPage.xaml.cs b/src/settings-ui/Settings.UI/SettingsXAML/Views/ColorPickerPage.xaml.cs index abb53f2b8f5d..37e6ffd47c3c 100644 --- 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.GetInstance(settingsUtils), - null, + SettingsRepository.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 index c851ebb90062..d6006a58f792 100644 --- 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.ModuleName, settingsUpgrader: ColorPickerSettings.UpgradeSettings); - } - else - { - _colorPickerSettings = colorPickerSettingsRepository.SettingsConfig; // used in the unit tests - } + _colorPickerSettings = colorPickerSettingsRepository.SettingsConfig; InitializeEnabledValue();