update with latest code.
MODIFY
WalletWasabi.Gui/App.xaml.cs
WalletWasabi.Gui/App.xaml.cs
@@ -7,13 +7,16 @@ namespace WalletWasabi.Gui
{
public class App : Application
{
+ public App ()
+ {
+ Name = "Wasabi Wallet";
+ }
+
public override void Initialize()
{
AvaloniaXamlLoader.Load(this);
}
- public override string Title => "Wasabi Wallet";
-
public override void OnFrameworkInitializationCompleted()
{
if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)

MODIFY
WalletWasabi.Gui/Global.cs
WalletWasabi.Gui/Global.cs
using Avalonia;
+using Avalonia.Controls.ApplicationLifetimes;
using Avalonia.Threading;
using NBitcoin;
using NBitcoin.Protocol;
@@ -174,7 +175,11 @@ namespace WalletWasabi.Gui
KillRequested = true;
await TryDesperateDequeueAllCoinsAsync();
- Dispatcher.UIThread.PostLogException(() => Application.Current?.MainWindow?.Close());
+ Dispatcher.UIThread.PostLogException(() =>
+ {
+ var window = (Application.Current.ApplicationLifetime as IClassicDesktopStyleApplicationLifetime).MainWindow;
+ window?.Close();
+ });
await DisposeAsync();
Logger.LogSoftwareStopped("Wasabi");

MODIFY
WalletWasabi.Gui/Tabs/WalletManager/LoadWalletViewModel.cs
WalletWasabi.Gui/Tabs/WalletManager/LoadWalletViewModel.cs
@@ -95,7 +95,8 @@ namespace WalletWasabi.Gui.Tabs.WalletManager
ofd.InitialDirectory = Environment.GetFolderPath(Environment.SpecialFolder.Personal);
}
- var selected = await ofd.ShowAsync(Application.Current.MainWindow, fallBack: true);
+ var window = (Application.Current.ApplicationLifetime as IClassicDesktopStyleApplicationLifetime).MainWindow;
+ var selected = await ofd.ShowAsync(window, fallBack: true);
if (selected != null && selected.Any())
{
var path = selected.First();

MODIFY
WalletWasabi.Gui/ViewModels/StatusBarViewModel.cs
WalletWasabi.Gui/ViewModels/StatusBarViewModel.cs
@@ -127,7 +127,7 @@ namespace WalletWasabi.Gui.ViewModels
.ObserveOn(RxApp.MainThreadScheduler)
.Subscribe(tup =>
{
- (int filtersLeft, bool downloadingBlock) = tup.ToValueTuple();
+ (int filtersLeft, bool downloadingBlock) = tup;
if (filtersLeft == 0 && !downloadingBlock)
{
TryRemoveStatus(StatusBarStatus.Synchronizing);
@@ -142,7 +142,7 @@ namespace WalletWasabi.Gui.ViewModels
.ObserveOn(RxApp.MainThreadScheduler)
.Subscribe(tup =>
{
- (TorStatus tor, BackendStatus backend, int peers) = tup.ToValueTuple();
+ (TorStatus tor, BackendStatus backend, int peers) = tup;
if (tor == TorStatus.NotRunning || backend != BackendStatus.Connected || peers < 1)
{
TryAddStatus(StatusBarStatus.Connecting);

MODIFY
WalletWasabi.Gui/WalletWasabi.Gui.csproj
WalletWasabi.Gui/WalletWasabi.Gui.csproj
</ItemGroup>
<ItemGroup>
- <PackageReference Include="AvalonStudio.Shell" Version="0.8.9992" />
- <PackageReference Include="Avalonia" Version="0.8.999-cibuild0004163-beta" />
- <PackageReference Include="Dock.Avalonia.Themes.Default" Version="0.9.0-build20190904-02" />
- <PackageReference Include="Dock.Avalonia.Themes.Metro" Version="0.9.0-build20190904-02" />
+ <PackageReference Include="AvalonStudio.Shell" Version="0.8.9994" />
+ <PackageReference Include="Avalonia" Version="0.8.999-cibuild0004348-beta" />
+ <PackageReference Include="Dock.Avalonia.Themes.Default" Version="0.9.0-build20190930-03" />
+ <PackageReference Include="Dock.Avalonia.Themes.Metro" Version="0.9.0-build20190930-03" />
+ <PackageReference Include="System.Runtime" Version="4.3.1" />
</ItemGroup>

update with latest code.