Add legal issues
MODIFY
WalletWasabi.Gui/Shell/Commands/HelpCommands.cs
WalletWasabi.Gui/Shell/Commands/HelpCommands.cs
@@ -46,6 +46,12 @@ namespace WalletWasabi.Gui.Shell.Commands
IoC.Get<IShell>().AddDocument(new TermsAndConditionsViewModel());
}));
+ LegalIssuesCommand = new CommandDefinition(
+ "Legal Issues", null, ReactiveCommand.Create(() =>
+ {
+ IoC.Get<IShell>().AddDocument(new LegalIssuesViewModel());
+ }));
+
DevToolsCommand = new CommandDefinition("Dev Tools", null, ReactiveCommand.Create(() =>
{
var devTools = new DevTools(Window.OpenWindows.FirstOrDefault());
@@ -84,6 +90,9 @@ namespace WalletWasabi.Gui.Shell.Commands
[ExportCommandDefinition("Help.TermsAndConditions")]
public CommandDefinition TermsAndConditionsCommand { get; }
+ [ExportCommandDefinition("Help.LegalIssues")]
+ public CommandDefinition LegalIssuesCommand { get; }
+
[ExportCommandDefinition("Help.DevTools")]
public CommandDefinition DevToolsCommand { get; }
}

MODIFY
WalletWasabi.Gui/Shell/MainMenu/HelpMainMenuItems.cs
WalletWasabi.Gui/Shell/MainMenu/HelpMainMenuItems.cs
@@ -58,6 +58,11 @@ namespace WalletWasabi.Gui.Shell.MainMenu
[DefaultGroup("Legal")]
public IMenuItem TermsAndConditions => _menuItemFactory.CreateCommandMenuItem("Help.TermsAndConditions");
+ [ExportMainMenuItem("Help", "LegalIssues")]
+ [DefaultOrder(2)]
+ [DefaultGroup("Legal")]
+ public IMenuItem LegalIssues => _menuItemFactory.CreateCommandMenuItem("Help.LegalIssues");
+
[ExportMainMenuItem("Help", "Dev Tools")]
[DefaultOrder(300)]
[DefaultGroup("About")]

MODIFY
WalletWasabi.Gui/Tabs/PrivacyPolicyViewModel.cs
WalletWasabi.Gui/Tabs/PrivacyPolicyViewModel.cs
@@ -61,6 +61,5 @@ In case you have any questions concerning zkSNACKs' Data Protection Declaration
}
public string PrivacyPolicy { get; }
-
}
}

MODIFY
WalletWasabi.Gui/Tabs/WalletManager/GenerateWalletView.xaml
WalletWasabi.Gui/Tabs/WalletManager/GenerateWalletView.xaml
<StackPanel Orientation="Horizontal">
<TextBlock Text="I agree to the " />
<Button Content="Terms and Conditions" Classes="activeHyperLink" Command="{Binding OnTermsClicked}" />
- <TextBlock Text=" and " />
+ <TextBlock Text=", " />
<Button Content="Privacy Policy" Classes="activeHyperLink" Command="{Binding OnPrivacyClicked}" />
- <TextBlock Text="." />
+ <TextBlock Text=" and " />
+ <Button Content="Legal Issues" Classes="activeHyperLink" Command="{Binding OnLegalClicked}" />
+ <TextBlock Text=" documents." />
</StackPanel>
</CheckBox>
<Button Content="Generate" Command="{Binding GenerateCommand}" DockPanel.Dock="Right" />

MODIFY
WalletWasabi.Gui/Tabs/WalletManager/GenerateWalletViewModel.cs
WalletWasabi.Gui/Tabs/WalletManager/GenerateWalletViewModel.cs
@@ -94,10 +94,17 @@ namespace WalletWasabi.Gui.Tabs.WalletManager
public void OnTermsClicked()
{
+ IoC.Get<IShell>().AddDocument(new TermsAndConditionsViewModel());
}
public void OnPrivacyClicked()
{
+ IoC.Get<IShell>().AddDocument(new PrivacyPolicyViewModel());
+ }
+
+ public void OnLegalClicked()
+ {
+ IoC.Get<IShell>().AddDocument(new LegalIssuesViewModel());
}
public override void OnCategorySelected()

MODIFY
WalletWasabi.Gui/Tabs/WalletManager/RecoverWalletView.xaml
WalletWasabi.Gui/Tabs/WalletManager/RecoverWalletView.xaml
<StackPanel Orientation="Horizontal">
<TextBlock Text="I agree to the " />
<Button Content="Terms and Conditions" Classes="activeHyperLink" Command="{Binding OnTermsClicked}" />
- <TextBlock Text=" and " />
+ <TextBlock Text=", " />
<Button Content="Privacy Policy" Classes="activeHyperLink" Command="{Binding OnPrivacyClicked}" />
- <TextBlock Text="." />
+ <TextBlock Text=" and " />
+ <Button Content="Legal Issues" Classes="activeHyperLink" Command="{Binding OnLegalClicked}" />
+ <TextBlock Text=" documents." />
</StackPanel>
</CheckBox>
<Button Content="Recover" Command="{Binding RecoverCommand}" DockPanel.Dock="Right" />

MODIFY
WalletWasabi.Gui/Tabs/WalletManager/RecoverWalletViewModel.cs
WalletWasabi.Gui/Tabs/WalletManager/RecoverWalletViewModel.cs
@@ -95,10 +95,17 @@ namespace WalletWasabi.Gui.Tabs.WalletManager
public void OnTermsClicked()
{
+ IoC.Get<IShell>().AddDocument(new TermsAndConditionsViewModel());
}
public void OnPrivacyClicked()
{
+ IoC.Get<IShell>().AddDocument(new PrivacyPolicyViewModel());
+ }
+
+ public void OnLegalClicked()
+ {
+ IoC.Get<IShell>().AddDocument(new LegalIssuesViewModel());
}
public override void OnCategorySelected()

MODIFY
WalletWasabi.Gui/ViewModels/StatusBarViewModel.cs
WalletWasabi.Gui/ViewModels/StatusBarViewModel.cs
@@ -121,11 +121,19 @@ namespace WalletWasabi.Gui.ViewModels
{
SetStatus();
});
+ this.WhenAnyValue(x => x.Backend).Subscribe(backend =>
+ {
+ SetStatus();
+ });
+ this.WhenAnyValue(x => x.Peers).Subscribe(peers =>
+ {
+ SetStatus();
+ });
}
private void SetStatus()
{
- if (Tor != TorStatus.Running)
+ if (Tor != TorStatus.Running || Backend != BackendStatus.Online || Peers < 1)
{
Status = "Connecting...";
}

MODIFY
WalletWasabi.Gui/WalletWasabi.Gui.csproj
WalletWasabi.Gui/WalletWasabi.Gui.csproj
<ItemGroup>
<EmbeddedResource Include="**\*.xaml;Assets\*" Exclude="bin\**;obj\**;**\*.xproj;packages\**;@(EmbeddedResource)" />
+ <None Remove="Tabs\LegalIssuesView.xaml" />
<Compile Update="**\*.xaml.cs">
<DependentUpon>%(Filename)</DependentUpon>
<ProjectReference Include="..\WalletWasabi\WalletWasabi.csproj" />
</ItemGroup>
+ <ItemGroup>
+ <EmbeddedResource Update="Tabs\LegalIssuesView.xaml">
+ <Generator></Generator>
+ </EmbeddedResource>
+ </ItemGroup>
+
</Project>

Add legal issues