diff --git a/WalletWasabi.Fluent/Models/UI/ApplicationSettings.cs b/WalletWasabi.Fluent/Models/UI/ApplicationSettings.cs index 9fe1c2b440e..aa82632afee 100644 --- a/WalletWasabi.Fluent/Models/UI/ApplicationSettings.cs +++ b/WalletWasabi.Fluent/Models/UI/ApplicationSettings.cs @@ -71,7 +71,6 @@ public partial class ApplicationSettings : ReactiveObject [AutoNotify] private bool _privacyMode; [AutoNotify] private bool _oobe; - [AutoNotify] private bool _showCoordinatorAnnouncement; [AutoNotify] private WindowState _windowState; // Non-persistent @@ -123,7 +122,6 @@ public ApplicationSettings(string persistentConfigFilePath, PersistentConfig per _privacyMode = _uiConfig.PrivacyMode; _oobe = _uiConfig.Oobe; - _showCoordinatorAnnouncement = _uiConfig.ShowCoordinatorAnnouncement; _windowState = (WindowState)Enum.Parse(typeof(WindowState), _uiConfig.WindowState); @@ -171,7 +169,6 @@ public ApplicationSettings(string persistentConfigFilePath, PersistentConfig per x => x.RunOnSystemStartup, x => x.HideOnClose, x => x.Oobe, - x => x.ShowCoordinatorAnnouncement, x => x.WindowState) .Skip(1) .Throttle(TimeSpan.FromMilliseconds(ThrottleTime)) @@ -406,7 +403,6 @@ private void ApplyUiConfigChanges() _uiConfig.RunOnSystemStartup = RunOnSystemStartup; _uiConfig.HideOnClose = HideOnClose; _uiConfig.Oobe = Oobe; - _uiConfig.ShowCoordinatorAnnouncement = ShowCoordinatorAnnouncement; _uiConfig.WindowState = WindowState.ToString(); } diff --git a/WalletWasabi.Fluent/UiConfig.cs b/WalletWasabi.Fluent/UiConfig.cs index aa5da3302f3..9847dd9ac9f 100644 --- a/WalletWasabi.Fluent/UiConfig.cs +++ b/WalletWasabi.Fluent/UiConfig.cs @@ -22,7 +22,6 @@ public class UiConfig : ConfigBase private string _windowState = "Normal"; private bool _runOnSystemStartup; private bool _oobe; - private bool _showCoordinatorAnnouncement; private bool _hideOnClose; private bool _autoPaste; private int _feeTarget; @@ -68,12 +67,6 @@ public UiConfig(string filePath) : base(filePath) .Skip(1) // Won't save on UiConfig creation. .ObserveOn(RxApp.TaskpoolScheduler) .Subscribe(_ => ToFile()); - - this.WhenAnyValue(x => x.ShowCoordinatorAnnouncement) - .Throttle(TimeSpan.FromMilliseconds(500)) - .Skip(1) // Won't save on UiConfig creation. - .ObserveOn(RxApp.MainThreadScheduler) - .Subscribe(_ => ToFile()); } [JsonProperty(PropertyName = "Oobe", DefaultValueHandling = DefaultValueHandling.Populate)] @@ -84,14 +77,6 @@ public bool Oobe set => RaiseAndSetIfChanged(ref _oobe, value); } - [JsonProperty(PropertyName = "ShowCoordinatorAnnouncement", DefaultValueHandling = DefaultValueHandling.Populate)] - [DefaultValue(true)] - public bool ShowCoordinatorAnnouncement - { - get => _showCoordinatorAnnouncement; - set => RaiseAndSetIfChanged(ref _showCoordinatorAnnouncement, value); - } - [JsonProperty(PropertyName = "WindowState")] [JsonConverter(typeof(WindowStateAfterStartJsonConverter))] public string WindowState diff --git a/WalletWasabi.Fluent/ViewModels/Dialogs/Announcement/ZkSnacksCoordinatorAnnouncementViewModel.cs b/WalletWasabi.Fluent/ViewModels/Dialogs/Announcement/ZkSnacksCoordinatorAnnouncementViewModel.cs deleted file mode 100644 index c50a6da103b..00000000000 --- a/WalletWasabi.Fluent/ViewModels/Dialogs/Announcement/ZkSnacksCoordinatorAnnouncementViewModel.cs +++ /dev/null @@ -1,35 +0,0 @@ -using System.Windows.Input; -using ReactiveUI; -using WalletWasabi.Fluent.Models.UI; - -namespace WalletWasabi.Fluent.ViewModels.Dialogs.Announcement; - -[NavigationMetaData(Title = "Announcement", NavigationTarget = NavigationTarget.CompactDialogScreen)] -public partial class ZkSnacksCoordinatorAnnouncementViewModel : AnnouncementBase -{ - public ZkSnacksCoordinatorAnnouncementViewModel(UiContext uiContext) - { - UiContext = uiContext; - SetupCancel(enableCancel: false, enableCancelOnEscape: true, enableCancelOnPressed: true); - EnableBack = false; - NextCommand = CancelCommand; - - OpenSettingsCommand = ReactiveCommand.CreateFromTask(async () => - { - Close(); - - if (UiContext.MainViewModel is { } mainViewModel) - { - await mainViewModel.SettingsPage.ActivateCoordinatorTab(); - } - }); - } - - public ICommand OpenSettingsCommand { get; } - - protected override void OnDialogClosed() - { - base.OnDialogClosed(); - UiContext.ApplicationSettings.ShowCoordinatorAnnouncement = false; - } -} diff --git a/WalletWasabi.Fluent/ViewModels/MainViewModel.cs b/WalletWasabi.Fluent/ViewModels/MainViewModel.cs index ad4868b6012..4f0d3ad144c 100644 --- a/WalletWasabi.Fluent/ViewModels/MainViewModel.cs +++ b/WalletWasabi.Fluent/ViewModels/MainViewModel.cs @@ -144,10 +144,7 @@ private IEnumerable GetAnnouncements() { var announcements = new List(); - if (UiContext.ApplicationSettings.ShowCoordinatorAnnouncement) - { - announcements.Add(new ZkSnacksCoordinatorAnnouncementViewModel(UiContext)); - } + // Add Announcements here. return announcements; } diff --git a/WalletWasabi.Fluent/Views/Dialogs/Announcement/ZkSnacksCoordinatorAnnouncementView.axaml b/WalletWasabi.Fluent/Views/Dialogs/Announcement/ZkSnacksCoordinatorAnnouncementView.axaml deleted file mode 100644 index 0deac4eaf06..00000000000 --- a/WalletWasabi.Fluent/Views/Dialogs/Announcement/ZkSnacksCoordinatorAnnouncementView.axaml +++ /dev/null @@ -1,32 +0,0 @@ - - - - -