Add connections
MODIFY
WalletWasabi.Dependencies/AvalonStudio.Shell
WalletWasabi.Dependencies/AvalonStudio.Shell
-Subproject commit 5122e4f6dc4424331d629b2cb3f2f83d07431442
+Subproject commit 7736d7e9a7d2d99defa3a4c4045ff2eb57367074

MODIFY
WalletWasabi.Gui/Program.cs
WalletWasabi.Gui/Program.cs
@@ -3,6 +3,7 @@ using AvalonStudio.Shell;
using System;
using System.IO;
using System.Threading.Tasks;
+using WalletWasabi.Gui.ViewModels;
using WalletWasabi.Logging;
namespace WalletWasabi.Gui
@@ -14,6 +15,7 @@ namespace WalletWasabi.Gui
private static async Task Main(string[] args)
#pragma warning restore IDE1006 // Naming Styles
{
+ StatusBarViewModel statusBar = null;
try
{
Logger.SetFilePath(Path.Combine(Global.DataDir, "Logs.txt"));
@@ -24,16 +26,16 @@ namespace WalletWasabi.Gui
Logger.SetMinimumLevel(LogLevel.Debug);
Logger.SetModes(LogMode.Debug, LogMode.Console, LogMode.File);
#endif
-
- BuildAvaloniaApp().AfterSetup(async builder =>
- {
var configFilePath = Path.Combine(Global.DataDir, "Config.json");
var config = new Config(configFilePath);
await config.LoadOrCreateDefaultFileAsync();
Logger.LogInfo<Config>("Config is successfully initialized.");
Global.Initialize(config);
- }).StartShellApp<AppBuilder, MainWindow>("Wasabi Wallet", new DefaultLayoutFactory());
+ statusBar = new StatusBarViewModel(Global.Nodes.ConnectedNodes);
+
+ BuildAvaloniaApp()
+ .StartShellApp<AppBuilder, MainWindow>("Wasabi Wallet", new DefaultLayoutFactory(), () => new MainWindowViewModel(statusBar));
}
catch (Exception ex)
{
@@ -41,6 +43,7 @@ namespace WalletWasabi.Gui
}
finally
{
+ statusBar?.Dispose();
await Global.DisposeAsync();
}
}

MODIFY
WalletWasabi.Gui/WalletWasabi.Gui.csproj
WalletWasabi.Gui/WalletWasabi.Gui.csproj
<DocumentationFile>bin\Release\netcoreapp2.1\WalletWasabi.Gui.xml</DocumentationFile>
</PropertyGroup>
- <ItemGroup>
- <None Remove="Controls\ModalDialog.xaml" />
- </ItemGroup>
-
<ItemGroup>
<PackageReference Include="Avalonia.Desktop" Version="0.6.2-build5373-beta" />
</ItemGroup>
<ProjectReference Include="..\WalletWasabi\WalletWasabi.csproj" />
</ItemGroup>
- <ItemGroup>
- <EmbeddedResource Update="Controls\ModalDialog.xaml">
- <Generator>MSBuild:Compile</Generator>
- </EmbeddedResource>
- </ItemGroup>
-
</Project>

Add connections