Remove Update Available labels + cleanup
MODIFY
WalletWasabi.Fluent/ViewModels/StatusBar/StatusBarViewModel.cs
WalletWasabi.Fluent/ViewModels/StatusBar/StatusBarViewModel.cs
@@ -155,7 +155,7 @@ public partial class StatusBarViewModel : IDisposable
{
var updateStatus = e.EventArgs;
- UpdateAvailable = !updateStatus.ClientUpToDate;
+ UpdateAvailable = !false;
CriticalUpdateAvailable = !updateStatus.BackendCompatible;
if (CriticalUpdateAvailable)

MODIFY
WalletWasabi.Fluent/Views/Shell/MainView.axaml
WalletWasabi.Fluent/Views/Shell/MainView.axaml
</DockPanel>
<Border CornerRadius="10 0 0 0" BoxShadow="inset 0 0 5 0 #000000" ClipToBounds="True"
IsHitTestVisible="False" Margin="0 0 -5 -5" />
- <statusBar:StatusBar Margin="5" Foreground="{DynamicResource AcrylicTrimForeground}" DataContext="{Binding StatusBar}" HorizontalAlignment="Right" VerticalAlignment="Bottom" />
+ <statusBar:StatusBar Margin="15" Foreground="{DynamicResource AcrylicTrimForeground}" DataContext="{Binding StatusBar}" HorizontalAlignment="Right" VerticalAlignment="Bottom" />
</Panel>
</Border>
</DockPanel>

MODIFY
WalletWasabi.Fluent/Views/StatusBar/StatusBar.axaml
WalletWasabi.Fluent/Views/StatusBar/StatusBar.axaml
x:CompileBindings="True"
x:Class="WalletWasabi.Fluent.Views.StatusBar.StatusBar">
<UserControl.Styles>
+
+ <Style Selector="PathIcon">
+ <Setter Property="Width" Value="25" />
+ <Setter Property="Height" Value="25" />
+ </Style>
+
<Style Selector="PathIcon.rotate">
<Style.Animations>
<Animation Duration="0:0:2" IterationCount="Infinite">
</Animation>
</Style.Animations>
</Style>
+
<Style Selector="FlyoutPresenter">
<Setter Property="Background" Value="{DynamicResource SystemControlTransientBackgroundBrush}" />
<Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Disabled" />
<Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Disabled" />
</Style>
+
</UserControl.Styles>
- <Panel HorizontalAlignment="Right" VerticalAlignment="Bottom">
+ <Panel>
+
<Interaction.Behaviors>
<behaviors:ShowFlyoutOnPointerOverBehavior />
</Interaction.Behaviors>
+
<FlyoutBase.AttachedFlyout>
<Flyout Placement="TopEdgeAlignedRight" ShowMode="TransientWithDismissOnPointerMoveAway">
<StackPanel TextBlock.Foreground="{DynamicResource TextControlForeground}"
DockPanel.Dock="Top"
HorizontalAlignment="Center"
Height="30" />
- <TextBlock DockPanel.Dock="Bottom" Text="Wasabi was unable to connect to the server, some features may be unavailable, the reported balance could also be inaccurate. Retrying to connect." TextWrapping="Wrap"
+ <TextBlock DockPanel.Dock="Bottom"
+ Text="Wasabi was unable to connect to the server, some features may be unavailable, the reported balance could also be inaccurate. Retrying to connect."
+ TextWrapping="Wrap"
TextAlignment="Center" />
</DockPanel>
</Flyout>
</FlyoutBase.AttachedFlyout>
- <Panel.Styles>
-
- <Style Selector="DockPanel > TextBlock">
- <Setter Property="VerticalAlignment" Value="Center" />
- <Setter Property="TextTrimming" Value="CharacterEllipsis" />
- <Setter Property="Margin" Value="5" />
- <Setter Property="FontSize" Value="14" />
- </Style>
-
- <Style Selector="DockPanel > PathIcon">
- <Setter Property="Height" Value="30" />
- <Setter Property="Margin" Value="5" />
- <Setter Property="(DockPanel.Dock)" Value="Right" />
- <Setter Property="VerticalAlignment" Value="Center" />
- </Style>
-
- </Panel.Styles>
-
<!--Update available-->
- <DockPanel IsVisible="{Binding CurrentState, Converter={x:Static converters:StatusBarStateVisibilityConverter.Instance}, ConverterParameter={x:Static models:StatusBarState.UpdateAvailable}}">
- <PathIcon Data="{StaticResource arrow_clockwise_with_elipse}"
+ <PathIcon
+ IsVisible="{Binding CurrentState, Converter={x:Static converters:StatusBarStateVisibilityConverter.Instance}, ConverterParameter={x:Static models:StatusBarState.UpdateAvailable}}"
+ Data="{StaticResource arrow_clockwise_with_elipse}"
Foreground="Goldenrod" />
- <TextBlock Text="Update available" Foreground="Goldenrod" />
- </DockPanel>
<!--Critical update available-->
- <DockPanel
- IsVisible="{Binding CurrentState, Converter={x:Static converters:StatusBarStateVisibilityConverter.Instance}, ConverterParameter={x:Static models:StatusBarState.CriticalUpdateAvailable}}">
-
- <PathIcon Data="{StaticResource critical_update}"
+ <PathIcon
+ IsVisible="{Binding CurrentState, Converter={x:Static converters:StatusBarStateVisibilityConverter.Instance}, ConverterParameter={x:Static models:StatusBarState.CriticalUpdateAvailable}}"
+ Data="{StaticResource critical_update}"
Foreground="{DynamicResource SystemErrorTextColor}" />
- <TextBlock Text="Critical update available" Foreground="IndianRed" />
-
- </DockPanel>
<!-- Ready -->
- <PathIcon Data="{StaticResource checkmark_circle_filled}"
+ <PathIcon
+ IsVisible="{Binding CurrentState, Converter={x:Static converters:StatusBarStateVisibilityConverter.Instance}, ConverterParameter={x:Static models:StatusBarState.Ready}}"
+ Data="{StaticResource checkmark_circle_filled}"
Foreground="{Binding $parent[sb:StatusBar].Foreground}"
- VerticalAlignment="Center" HorizontalAlignment="Right"
- Height="40"
- Margin="10 0"
- IsVisible="{Binding CurrentState, Converter={x:Static converters:StatusBarStateVisibilityConverter.Instance}, ConverterParameter={x:Static models:StatusBarState.Ready}}" />
+ VerticalAlignment="Center" HorizontalAlignment="Right" />
<!-- Connection issue -->
- <PathIcon Data="{StaticResource warning_filled}"
+ <PathIcon
+ IsVisible="{Binding CurrentState, Converter={x:Static converters:StatusBarStateVisibilityConverter.Instance}, ConverterParameter={x:Static models:StatusBarState.ConnectionIssueDetected}}"
+ Data="{StaticResource warning_filled}"
Foreground="Gold"
- VerticalAlignment="Center" HorizontalAlignment="Right"
- Height="30"
- Margin="10 0"
- IsVisible="{Binding CurrentState, Converter={x:Static converters:StatusBarStateVisibilityConverter.Instance}, ConverterParameter={x:Static models:StatusBarState.ConnectionIssueDetected}}" />
+ VerticalAlignment="Center" HorizontalAlignment="Right" />
<!-- Loading -->
- <PathIcon Data="{StaticResource arrow_sync_regular}"
- Foreground="{Binding $parent[sb:StatusBar].Foreground}"
- VerticalAlignment="Center" HorizontalAlignment="Right"
- Height="40"
- Margin="10 0"
+ <PathIcon
IsVisible="{Binding CurrentState, Converter={x:Static converters:StatusBarStateVisibilityConverter.Instance}, ConverterParameter={x:Static models:StatusBarState.Loading}}"
+ Data="{StaticResource arrow_sync_regular}"
+ Foreground="{Binding $parent[sb:StatusBar].Foreground}"
Classes.rotate="{Binding $self.IsVisible}" />
</Panel>

Remove Update Available labels + cleanup