fix conflict mistake
MODIFY
WalletWasabi.Fluent/ViewModels/Dialogs/DialogViewModelBase.cs
WalletWasabi.Fluent/ViewModels/Dialogs/DialogViewModelBase.cs
-using System;
-using System.Reactive.Linq;
-using System.Threading.Tasks;
-using ReactiveUI;
+using WalletWasabi.Gui.ViewModels;
namespace WalletWasabi.Fluent.ViewModels.Dialogs
{

MODIFY
WalletWasabi.Fluent/ViewModels/SettingsPageViewModel.cs
WalletWasabi.Fluent/ViewModels/SettingsPageViewModel.cs
using ReactiveUI;
using System.Windows.Input;
+using WalletWasabi.Fluent.ViewModels.Dialogs;
using WalletWasabi.Gui.Validation;
using WalletWasabi.Models;
namespace WalletWasabi.Fluent.ViewModels
@@ -17,8 +18,11 @@ namespace WalletWasabi.Fluent.ViewModels
{
var x = new TestDialogViewModel();
var result = await x.ShowDialogAsync(MainViewModel.Instance);
- }); this.ValidateProperty(x => x.RandomString, (IValidationErrors errors) => errors.Add(ErrorSeverity.Error, "Random Error Message"));
- this.RaisePropertyChanged(nameof(RandomString)); }
+ });
+
+ this.ValidateProperty(x => x.RandomString, (IValidationErrors errors) => errors.Add(ErrorSeverity.Error, "Random Error Message"));
+ this.RaisePropertyChanged(nameof(RandomString));
+ }
public string RandomString
{

MODIFY
WalletWasabi.Fluent/Views/SettingsPageView.axaml
WalletWasabi.Fluent/Views/SettingsPageView.axaml
<StackPanel Spacing="10">
<TextBlock Text="Settings" FontSize="22" VerticalAlignment="Center" HorizontalAlignment="Center" />
<Button Command="{Binding NextCommand}" Content="Next" />
- <Button Command="{Binding NextCommand}" Content="Next" />
<Button Command="{Binding OpenDialogCommand}" Content="Open Dialog" />
<TextBox Watermark="Type here..."/>
<TextBox Watermark="Type here... #2"/>

fix conflict mistake