delete "Notify user" todos.
MODIFY
WalletWasabi.Fluent/ViewModels/AddWallet/HardwareWallet/DetectedHardwareWalletViewModel.cs
WalletWasabi.Fluent/ViewModels/AddWallet/HardwareWallet/DetectedHardwareWalletViewModel.cs
@@ -2,9 +2,9 @@ using System;
using System.Windows.Input;
using ReactiveUI;
using WalletWasabi.Extensions;
+using WalletWasabi.Fluent.Helpers;
using WalletWasabi.Fluent.ViewModels.Navigation;
using WalletWasabi.Hwi.Models;
-using WalletWasabi.Logging;
namespace WalletWasabi.Fluent.ViewModels.AddWallet.HardwareWallet
{
@@ -50,8 +50,7 @@ namespace WalletWasabi.Fluent.ViewModels.AddWallet.HardwareWallet
}
catch(Exception ex)
{
- // TODO: Notify the user
- Logger.LogError(ex);
+ FluentLogger.ShowAndLogError(ex);
Navigate().Back();
}

MODIFY
WalletWasabi.Fluent/ViewModels/Dialogs/ShowErrorDialogViewModel.cs
WalletWasabi.Fluent/ViewModels/Dialogs/ShowErrorDialogViewModel.cs
-using WalletWasabi.Fluent.ViewModels.Navigation;
+using ReactiveUI;
namespace WalletWasabi.Fluent.ViewModels.Dialogs
{
- public partial class ShowErrorDialogViewModel : DialogViewModelBase
+ public class ShowErrorDialogViewModel : DialogViewModelBase<bool>
{
- [AutoNotify] private string _message;
-
public ShowErrorDialogViewModel(string message)
{
- _message = message;
+ Message = message;
+
+ NextCommand = ReactiveCommand.Create(() => Close());
}
+
+ public string Message { get; }
}
}
\ No newline at end of file

MODIFY
WalletWasabi.Fluent/ViewModels/TransactionBroadcasting/BroadcastTransactionViewModel.cs
WalletWasabi.Fluent/ViewModels/TransactionBroadcasting/BroadcastTransactionViewModel.cs
@@ -5,8 +5,8 @@ using NBitcoin;
using ReactiveUI;
using WalletWasabi.Blockchain.TransactionBroadcasting;
using WalletWasabi.Blockchain.Transactions;
+using WalletWasabi.Fluent.Helpers;
using WalletWasabi.Fluent.ViewModels.Navigation;
-using WalletWasabi.Logging;
using WalletWasabi.Stores;
namespace WalletWasabi.Fluent.ViewModels.TransactionBroadcasting
@@ -87,8 +87,7 @@ namespace WalletWasabi.Fluent.ViewModels.TransactionBroadcasting
}
catch (Exception ex)
{
- // TODO: Notify the user
- Logger.LogError(ex);
+ FluentLogger.ShowAndLogError(ex);
}
Navigate().Back();

MODIFY
WalletWasabi.Fluent/ViewModels/TransactionBroadcasting/LoadTransactionViewModel.cs
WalletWasabi.Fluent/ViewModels/TransactionBroadcasting/LoadTransactionViewModel.cs
@@ -71,8 +71,7 @@ namespace WalletWasabi.Fluent.ViewModels.TransactionBroadcasting
}
catch (Exception ex)
{
- // TODO: Notify the user
- Logger.LogError(ex);
+ FluentLogger.ShowAndLogError(ex);
}
});
}

MODIFY
WalletWasabi.Fluent/Views/Dialogs/ShowErrorDialogView.axaml
WalletWasabi.Fluent/Views/Dialogs/ShowErrorDialogView.axaml
x:CompileBindings="True"
x:Class="WalletWasabi.Fluent.Views.Dialogs.ShowErrorDialogView">
<c:ContentArea Title="Something went wrong"
- Caption="We are sorry, something happened during the process, see details below."
+ Caption="We are sorry, something happened during the process."
EnableNext="True" NextContent="Done"
ScrollViewer.VerticalScrollBarVisibility="Disabled">
<DockPanel VerticalAlignment="Center">
- <TextBlock Text="{Binding Message}" DockPanel.Dock="Bottom" TextAlignment="Center" TextWrapping="Wrap" Margin="0 40 0 0" />
- <Viewbox MaxHeight="150">
+ <TextBlock Text="{Binding Message}" DockPanel.Dock="Bottom" TextAlignment="Center" TextWrapping="Wrap" MaxWidth="500" Margin="100 0"/>
+ <Viewbox MaxHeight="150" Margin="40">
<PathIcon Data="{StaticResource warning_regular}" />
</Viewbox>
</DockPanel>

MODIFY
WalletWasabi.Fluent/Views/Wallets/LoginView.axaml
WalletWasabi.Fluent/Views/Wallets/LoginView.axaml
<behaviors:FocusOnAttachedBehavior />
</i:Interaction.Behaviors>
</TextBox>
- <Button Content="Login" Classes="action" HorizontalAlignment="Right" />
+ <Button Content="Login" Classes="action" HorizontalAlignment="Right" Click="Button_OnClick" />
</StackPanel>
</UserControl>

MODIFY
WalletWasabi.Fluent/Views/Wallets/LoginView.xaml.cs
WalletWasabi.Fluent/Views/Wallets/LoginView.xaml.cs
+using System;
using Avalonia.Controls;
+using Avalonia.Interactivity;
using Avalonia.Markup.Xaml;
+using WalletWasabi.Fluent.Helpers;
namespace WalletWasabi.Fluent.Views.Wallets
{
@@ -14,5 +17,10 @@ namespace WalletWasabi.Fluent.Views.Wallets
{
AvaloniaXamlLoader.Load(this);
}
+
+ private void Button_OnClick(object? sender, RoutedEventArgs e)
+ {
+ FluentLogger.ShowAndLogError(new Exception("Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book."));
+ }
}
}

delete "Notify user" todos.