Fix lock screen initialisation.
MODIFY
WalletWasabi.Gui/Controls/LockScreen/LockScreenViewModelBase.cs
WalletWasabi.Gui/Controls/LockScreen/LockScreenViewModelBase.cs
@@ -29,6 +29,8 @@ namespace WalletWasabi.Gui.Controls.LockScreen
.ObserveOn(RxApp.MainThreadScheduler)
.BindTo(global.UiConfig, y => y.LockScreenActive)
.DisposeWith(Disposables);
+
+ IsLocked = global.UiConfig.LockScreenActive;
}
public bool IsLocked

MODIFY
WalletWasabi.Gui/Controls/LockScreen/PinLockScreenView.xaml
WalletWasabi.Gui/Controls/LockScreen/PinLockScreenView.xaml
x:Class="WalletWasabi.Gui.Controls.LockScreen.PinLockScreenView"
IsLocked="{Binding IsLocked}">
<lockscreen:PinLockScreenView.Styles>
- <Style Selector="Grid.Shade">
- <Setter Property="Opacity" Value="0" />
- <Setter Property="TranslateTransform.Y" Value="-100" />
- </Style>
<Style Selector="lockscreen|PinLockScreenView[IsLocked=true] Grid.Shade">
<Style.Animations>
<Animation FillMode="Both" Duration="0:0:1.5" Easing="QuarticEaseInOut">
<KeyFrame Cue="0%">
<Setter Property="IsVisible" Value="True" />
+ <Setter Property="TranslateTransform.Y" Value="-100" />
+ <Setter Property="Opacity" Value="0" />
</KeyFrame>
<KeyFrame Cue="100%">
<Setter Property="Opacity" Value="1" />

MODIFY
WalletWasabi.Gui/ViewModels/MainWindowViewModel.cs
WalletWasabi.Gui/ViewModels/MainWindowViewModel.cs
@@ -91,11 +91,11 @@ namespace WalletWasabi.Gui.ViewModels
WindowState = WindowState.Maximized;
}
+ InitialiseLockScreen(global.UiConfig);
+
StatusBar = new StatusBarViewModel();
DisplayWalletManager();
-
-
}
public void Initialize()
@@ -108,17 +108,10 @@ namespace WalletWasabi.Gui.ViewModels
{
MainWindowViewModel.Instance.Title += $" - {global.Network}";
}
-
- InitialiseLockScreen(global.UiConfig);
}
private void InitialiseLockScreen (UiConfig uiConfig)
{
- uiConfig
- .WhenAnyValue(x => x.LockScreenPinHash)
- .ObserveOn(RxApp.MainThreadScheduler)
- .Subscribe(CheckLockScreenType);
-
uiConfig
.WhenAnyValue(x => x.LockScreenActive)
.ObserveOn(RxApp.MainThreadScheduler)
@@ -130,7 +123,7 @@ namespace WalletWasabi.Gui.ViewModels
}
else
{
- LockScreen.IsLocked = false;
+ LockScreen = null;
}
});

Fix lock screen initialisation.