partial polish of the "Privacy Control" UI.
MODIFY
WalletWasabi.Fluent/Views/Wallets/Send/PocketSuggestionControl.axaml
WalletWasabi.Fluent/Views/Wallets/Send/PocketSuggestionControl.axaml
</Button>
</DockPanel>
- <TextBlock Text="Customize this?" TextWrapping="Wrap" HorizontalAlignment="Center" />
+ <TextBlock Text="Control your privacy?" TextWrapping="Wrap" HorizontalAlignment="Center" />
</StackPanel>
</Border>

MODIFY
WalletWasabi.Fluent/Views/Wallets/Send/PrivacyControlView.axaml
WalletWasabi.Fluent/Views/Wallets/Send/PrivacyControlView.axaml
xmlns:i="using:Avalonia.Xaml.Interactivity"
xmlns:behaviors="clr-namespace:WalletWasabi.Fluent.Behaviors"
x:Class="WalletWasabi.Fluent.Views.Wallets.Send.PrivacyControlView">
- <c:ContentArea Title="Send - Privacy Control"
- Caption="Parts of your wallet are known to certain entities."
+ <c:ContentArea Title="Send - Control your privacy"
+ Caption="Using unmixed funds can leak information entities you have transacted with in the past. Take control of who could know about this transaction"
EnableBack="{Binding EnableBack}"
EnableNext="True" NextContent="Continue"
IsBusy="{Binding IsBusy}"
ScrollViewer.VerticalScrollBarVisibility="Disabled">
- <DockPanel>
- <DockPanel.Styles>
+ <c:ContentArea.Styles>
<Style Selector="c|TagControl[DataContext=Private Funds], c|TagControl[DataContext=Private Funds] PathIcon">
<Setter Property="Foreground" Value="{DynamicResource SystemAccentColor}" />
<Setter Property="BorderBrush" Value="{DynamicResource SystemAccentColor}" />
<Style Selector="c|TagControl:disabled">
<Setter Property="Opacity" Value="0.5" />
</Style>
- </DockPanel.Styles>
-
- <c:InfoMessage DockPanel.Dock="Bottom" HorizontalAlignment="Center" Margin="0 20" Opacity="0.6"
- Content="Even if you left someone there, not all of them will know about this transaction." />
-
- <TextBlock Text="Remove the entities you cannot tolerate leaking information about this transaction:" DockPanel.Dock="Top" />
+ </c:ContentArea.Styles>
+ <Grid RowDefinitions="*, 40, *" Margin="0 20" VerticalAlignment="Stretch"
+ DataContext="{Binding LabelSelection}">
+ <Border Background="#F5F7EE" CornerRadius="10">
+ <DockPanel>
+ <Border DockPanel.Dock="Top" Padding="20 20 20 0">
+ <StackPanel Orientation="Horizontal" Spacing="10">
+ <PathIcon Data="{StaticResource shield_regular}" Foreground="Green" Height="20" />
+ <TextBlock VerticalAlignment="Bottom" FontSize="18" Margin="0 2 0 0"
+ Text="I am comfortable leaking information about this transaction to: ">
+ </TextBlock>
+ </StackPanel>
+ </Border>
- <DockPanel DataContext="{Binding LabelSelection}">
- <ItemsControl DockPanel.Dock="Bottom" Items="{Binding LabelsBlackList}">
+ <ItemsControl Items="{Binding LabelsWhiteList}">
<ItemsControl.ItemsPanel>
<ItemsPanelTemplate>
<WrapPanel Orientation="Horizontal" />
</ItemsControl.ItemsPanel>
<ItemsControl.ItemTemplate>
<DataTemplate x:DataType="vm:LabelViewModel">
- <Button Classes="plain" Margin="5" Command="{Binding ClickedCommand}">
+ <Button Classes="plain" Margin="5" Command="{Binding ClickedCommand}" Padding="10">
<i:Interaction.Behaviors>
<behaviors:BindPointerOverBehavior IsPointerOver="{Binding IsPointerOver}" />
</i:Interaction.Behaviors>
<c:TagControl.Background>
<Binding Path="IsHighlighted">
<Binding.Converter>
- <converters:BoolToBrushConverter TrueBrush="Green" />
+ <converters:BoolToBrushConverter TrueBrush="#F28A81" />
</Binding.Converter>
</Binding>
</c:TagControl.Background>
</DataTemplate>
</ItemsControl.ItemTemplate>
</ItemsControl>
+ </DockPanel>
+ </Border>
- <Separator DockPanel.Dock="Bottom" />
+ <Separator Grid.Row="1" VerticalAlignment="Center" />
- <ItemsControl Items="{Binding LabelsWhiteList}">
+ <Border Grid.Row="2" Background="#7FF2F2F2" CornerRadius="10">
+ <DockPanel>
+ <Border DockPanel.Dock="Top" Padding="20 20 20 0">
+ <StackPanel Orientation="Horizontal" Spacing="10">
+ <PathIcon Data="{StaticResource warning_regular}" Height="20" />
+ <TextBlock VerticalAlignment="Bottom" FontSize="18" Margin="0 2 0 0"
+ Text="I'm NOT comfortable leaking information about this transaction to: ">
+ </TextBlock>
+ </StackPanel>
+ </Border>
+
+ <ItemsControl Items="{Binding LabelsBlackList}">
<ItemsControl.ItemsPanel>
<ItemsPanelTemplate>
<WrapPanel Orientation="Horizontal" />
<c:TagControl.Background>
<Binding Path="IsHighlighted">
<Binding.Converter>
- <converters:BoolToBrushConverter TrueBrush="Red" FalseBrush="Green" />
+ <converters:BoolToBrushConverter TrueBrush="#22B161" />
</Binding.Converter>
</Binding>
</c:TagControl.Background>
</DataTemplate>
</ItemsControl.ItemTemplate>
</ItemsControl>
-
- </DockPanel>
-
-
</DockPanel>
+ </Border>
+ </Grid>
</c:ContentArea>
</UserControl>
\ No newline at end of file

partial polish of the "Privacy Control" UI.