move over irrelevant stuff to the advanced info dialog
MODIFY
WalletWasabi.Fluent/ViewModels/AboutViewModel.cs
WalletWasabi.Fluent/ViewModels/AboutViewModel.cs
@@ -2,8 +2,10 @@ using System;
using System.IO;
using System.Reactive;
using System.Reactive.Linq;
-using JetBrains.Annotations;
+using System.Reactive.Threading.Tasks;
+using System.Windows.Input;
using ReactiveUI;
+using WalletWasabi.Fluent.ViewModels.Dialogs;
using WalletWasabi.Fluent.ViewModels.Navigation;
using WalletWasabi.WebClients.Wasabi;
using WalletWasabi.Helpers;
@@ -18,24 +20,44 @@ namespace WalletWasabi.Fluent.ViewModels
{
OpenBrowserCommand = ReactiveCommand.CreateFromTask<string>(IoHelpers.OpenBrowserAsync);
+ var interaction = new Interaction<object,object>();
+ interaction.RegisterHandler(
+ async x =>
+ x.SetOutput(
+ await new AboutAdvancedInfoViewModel(navigationState, NavigationTarget.DialogHost).ShowDialogAsync()));
+
+ AboutAdvancedInfoDialogCommand = ReactiveCommand.CreateFromTask(
+ async () =>
+ {
+ var h = await interaction
+ .Handle(null).ToTask();
+ });
+
OpenBrowserCommand.ThrownExceptions
.ObserveOn(RxApp.TaskpoolScheduler)
.Subscribe(ex => Logger.LogError(ex));
}
+ public ICommand AboutAdvancedInfoDialogCommand { get; }
+
public ReactiveCommand<string, Unit> OpenBrowserCommand { get; }
+
public Version ClientVersion => Constants.ClientVersion;
- public Version BitcoinCoreVersion => Constants.BitcoinCoreVersion;
- public Version HwiVersion => Constants.HwiVersion;
- public string BackendCompatibleVersions => Constants.ClientSupportBackendVersionText;
- public string CurrentBackendMajorVersion => WasabiClient.ApiVersion.ToString();
+
public string ClearnetLink => "https://wasabiwallet.io/";
+
public string TorLink => "http://wasabiukrxmkdgve5kynjztuovbg43uxcbcxn6y2okcrsg7gb6jdmbad.onion";
+
public string SourceCodeLink => "https://github.com/zkSNACKs/WalletWasabi/";
+
public string StatusPageLink => "https://stats.uptimerobot.com/YQqGyUL8A7";
+
public string UserSupportLink => "https://www.reddit.com/r/WasabiWallet/";
+
public string BugReportLink => "https://github.com/zkSNACKs/WalletWasabi/issues/";
+
public string FAQLink => "https://docs.wasabiwallet.io/FAQ/";
+
public string DocsLink => "https://docs.wasabiwallet.io/";
}
}
\ No newline at end of file

ADD
WalletWasabi.Fluent/ViewModels/Dialogs/AboutAdvancedInfoViewModel.cs
+using System;
+using ReactiveUI;
+using WalletWasabi.Fluent.ViewModels.Navigation;
+using WalletWasabi.Helpers;
+using WalletWasabi.WebClients.Wasabi;
+
+namespace WalletWasabi.Fluent.ViewModels.Dialogs
+{
+ public class AboutAdvancedInfoViewModel : DialogViewModelBase<object>
+ {
+ public AboutAdvancedInfoViewModel(NavigationStateViewModel navigationState, NavigationTarget navigationTarget) : base(navigationState, navigationTarget)
+ {
+ }
+
+ public Version BitcoinCoreVersion => Constants.BitcoinCoreVersion;
+
+ public Version HwiVersion => Constants.HwiVersion;
+
+ public string BackendCompatibleVersions => Constants.ClientSupportBackendVersionText;
+
+ public string CurrentBackendMajorVersion => WasabiClient.ApiVersion.ToString();
+
+ protected override void OnDialogClosed()
+ {
+ }
+ }
+}
\ No newline at end of file

MODIFY
WalletWasabi.Fluent/Views/AboutView.axaml
WalletWasabi.Fluent/Views/AboutView.axaml
</Style>
<Style Selector="TextBlock.Header">
<Setter Property="Margin" Value="0 4 0 0" />
- <Setter Property="(TextBlock.FontSize)" Value="{StaticResource FontSizeH8}" />
<Setter Property="FontWeight" Value="Bold" />
</Style>
<Style Selector="TextBox.Content">
<Setter Property="Margin" Value="0 4 0 0" />
- <Setter Property="(TextBlock.FontSize)" Value="{StaticResource FontSizeH8}" />
</Style>
</UserControl.Styles>
<Panel>
<TextBox Classes="Content selectable_text_block"
Text="{Binding ClientVersion, Converter={StaticResource VersionStringConverter}}" />
</StackPanel>
- <StackPanel>
- <TextBlock Classes="Header" Text="Compatible Coordinator Versions" />
- <TextBox Classes="Content selectable_text_block" Text="{Binding BackendCompatibleVersions}" />
- </StackPanel>
- <StackPanel>
- <TextBlock Classes="Header" Text="Current Coordinator Version" />
- <TextBox Classes="Content selectable_text_block" Text="{Binding CurrentBackendMajorVersion}" />
- </StackPanel>
- <StackPanel>
- <TextBlock Classes="Header" Text="Compatible Bitcoin Core and Bitcoin Knots Versions " />
- <TextBox Classes="Content selectable_text_block"
- Text="{Binding BitcoinCoreVersion, Converter={StaticResource VersionStringConverter}}" />
- </StackPanel>
- <StackPanel>
- <TextBlock Classes="Header" Text="Compatible Hardware Wallet Interface Version " />
- <TextBox Classes="Content selectable_text_block"
- Text="{Binding HwiVersion, Converter={StaticResource VersionStringConverter}}" />
+ <Button Classes="plain obscured"
+ Command="{Binding AboutAdvancedInfoDialogCommand}">
+ <StackPanel Orientation="Horizontal" Spacing="20">
+ <PathIcon Data="{StaticResource info_regular}" />
+ <TextBlock Text="Advanced Information..." />
</StackPanel>
+ </Button>
</StackPanel>
</controls:ContentArea>
</Panel>

MODIFY
WalletWasabi.Fluent/Views/AddWallet/RecoverWalletView.axaml
WalletWasabi.Fluent/Views/AddWallet/RecoverWalletView.axaml
</c:TagsBox>
</DockPanel>
- <StackPanel HorizontalAlignment="Right" Margin="0,20,0,0" Orientation="Horizontal">
<Button Classes="plain obscured"
Command="{Binding AdvancedRecoveryOptionsDialogCommand}">
- <StackPanel Orientation="Horizontal" Spacing="20">
+ <StackPanel Orientation="Horizontal">
<PathIcon Data="{StaticResource options_regular}" />
<TextBlock Text="Advanced Recovery Options..." />
</StackPanel>
</Button>
- <Panel Margin="15,0,0,0" Width="{Binding #IconCheckmark.Bounds.Width}" Height="1" />
- </StackPanel>
</StackPanel>
</c:ContentArea>
</UserControl>
\ No newline at end of file

ADD
WalletWasabi.Fluent/Views/Dialogs/AboutAdvancedInfoView.axaml
+<UserControl xmlns="https://github.com/avaloniaui"
+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+ xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+ xmlns:vm="using:WalletWasabi.Fluent.ViewModels"
+ xmlns:converters="using:WalletWasabi.Fluent.Converters"
+ xmlns:controls="clr-namespace:WalletWasabi.Fluent.Controls"
+ xmlns:dialogs="clr-namespace:WalletWasabi.Fluent.ViewModels.Dialogs"
+ mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+ x:DataType="dialogs:AboutAdvancedInfoViewModel"
+ x:CompileBindings="True"
+ x:Class="WalletWasabi.Fluent.Views.Dialogs.AboutAdvancedInfoView">
+ <UserControl.Resources>
+ <converters:VersionStringConverter x:Key="VersionStringConverter" />
+ </UserControl.Resources>
+ <UserControl.Styles>
+ <Style Selector="TextBlock.Header">
+ <Setter Property="Margin" Value="0 4 0 0" />
+ <Setter Property="FontWeight" Value="Bold" />
+ </Style>
+ <Style Selector="TextBox.Content">
+ <Setter Property="Margin" Value="0 4 0 0" />
+ </Style>
+ </UserControl.Styles>
+ <controls:ContentArea Title="Advanced Information"
+ EnableCancel="False"
+ EnableNext="False">
+ <StackPanel HorizontalAlignment="Center" Spacing="20" MinWidth="380" Margin="30 0 0 0">
+ <StackPanel>
+ <TextBlock Classes="Header" Text="Compatible Coordinator Versions" />
+ <TextBox Classes="Content selectable_text_block" Text="{Binding BackendCompatibleVersions}" />
+ </StackPanel>
+ <StackPanel>
+ <TextBlock Classes="Header" Text="Current Coordinator Version" />
+ <TextBox Classes="Content selectable_text_block" Text="{Binding CurrentBackendMajorVersion}" />
+ </StackPanel>
+ <StackPanel>
+ <TextBlock Classes="Header" Text="Compatible Bitcoin Core and Bitcoin Knots Versions " />
+ <TextBox Classes="Content selectable_text_block"
+ Text="{Binding BitcoinCoreVersion, Converter={StaticResource VersionStringConverter}}" />
+ </StackPanel>
+ <StackPanel>
+ <TextBlock Classes="Header" Text="Compatible Hardware Wallet Interface Version " />
+ <TextBox Classes="Content selectable_text_block"
+ Text="{Binding HwiVersion, Converter={StaticResource VersionStringConverter}}" />
+ </StackPanel>
+ </StackPanel>
+ </controls:ContentArea>
+
+</UserControl>
\ No newline at end of file

ADD
WalletWasabi.Fluent/Views/Dialogs/AboutAdvancedInfoView.axaml.cs
+using Avalonia.Markup.Xaml;
+using Avalonia.ReactiveUI;
+using WalletWasabi.Fluent.ViewModels.Dialogs;
+
+namespace WalletWasabi.Fluent.Views.Dialogs
+{
+ public class AboutAdvancedInfoView : ReactiveUserControl<AboutAdvancedInfoViewModel>
+ {
+ public AboutAdvancedInfoView()
+ {
+ InitializeComponent();
+ }
+
+ private void InitializeComponent()
+ {
+ AvaloniaXamlLoader.Load(this);
+ }
+ }
+}

move over irrelevant stuff to the advanced info dialog