Skip to content

Commit

Permalink
remove zkSANCKs coordinator down announcement (WalletWasabi#13207)
Browse files Browse the repository at this point in the history
  • Loading branch information
RolandUI authored Jul 25, 2024
1 parent 393b728 commit fc337b5
Show file tree
Hide file tree
Showing 6 changed files with 1 addition and 107 deletions.
4 changes: 0 additions & 4 deletions WalletWasabi.Fluent/Models/UI/ApplicationSettings.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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);

Expand Down Expand Up @@ -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))
Expand Down Expand Up @@ -406,7 +403,6 @@ private void ApplyUiConfigChanges()
_uiConfig.RunOnSystemStartup = RunOnSystemStartup;
_uiConfig.HideOnClose = HideOnClose;
_uiConfig.Oobe = Oobe;
_uiConfig.ShowCoordinatorAnnouncement = ShowCoordinatorAnnouncement;
_uiConfig.WindowState = WindowState.ToString();
}

Expand Down
15 changes: 0 additions & 15 deletions WalletWasabi.Fluent/UiConfig.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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)]
Expand All @@ -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
Expand Down

This file was deleted.

5 changes: 1 addition & 4 deletions WalletWasabi.Fluent/ViewModels/MainViewModel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -144,10 +144,7 @@ private IEnumerable<AnnouncementBase> GetAnnouncements()
{
var announcements = new List<AnnouncementBase>();

if (UiContext.ApplicationSettings.ShowCoordinatorAnnouncement)
{
announcements.Add(new ZkSnacksCoordinatorAnnouncementViewModel(UiContext));
}
// Add Announcements here.

return announcements;
}
Expand Down

This file was deleted.

This file was deleted.

0 comments on commit fc337b5

Please sign in to comment.