rename disposable -> disposables.
MODIFY
WalletWasabi.Fluent/ViewModels/AddWallet/AddWalletPageViewModel.cs
WalletWasabi.Fluent/ViewModels/AddWallet/AddWalletPageViewModel.cs
@@ -119,9 +119,9 @@ namespace WalletWasabi.Fluent.ViewModels.AddWallet
EnableAutoBusyOn(CreateWalletCommand);
}
- protected override void OnNavigatedTo(bool inStack, CompositeDisposable disposable)
+ protected override void OnNavigatedTo(bool inStack, CompositeDisposable disposables)
{
- base.OnNavigatedTo(inStack, disposable);
+ base.OnNavigatedTo(inStack, disposables);
_enableCancel = CurrentTarget != NavigationTarget.HomeScreen;

MODIFY
WalletWasabi.Fluent/ViewModels/AddWallet/HardwareWallet/ConnectHardwareWalletViewModel.cs
WalletWasabi.Fluent/ViewModels/AddWallet/HardwareWallet/ConnectHardwareWalletViewModel.cs
@@ -204,9 +204,9 @@ namespace WalletWasabi.Fluent.ViewModels.AddWallet.HardwareWallet
Navigate().To(new DetectedHardwareWalletViewModel(WalletManager, WalletName, device));
}
- protected override void OnNavigatedTo(bool inStack, CompositeDisposable disposable)
+ protected override void OnNavigatedTo(bool inStack, CompositeDisposable disposables)
{
- base.OnNavigatedTo(inStack, disposable);
+ base.OnNavigatedTo(inStack, disposables);
if (inStack)
{
@@ -221,7 +221,7 @@ namespace WalletWasabi.Fluent.ViewModels.AddWallet.HardwareWallet
await AbandonedTasks.WhenAllAsync();
CancelCts.Dispose();
})
- .DisposeWith(disposable);
+ .DisposeWith(disposables);
}
}
}

MODIFY
WalletWasabi.Fluent/ViewModels/AddWallet/HardwareWallet/DetectedHardwareWalletViewModel.cs
WalletWasabi.Fluent/ViewModels/AddWallet/HardwareWallet/DetectedHardwareWalletViewModel.cs
@@ -66,16 +66,16 @@ namespace WalletWasabi.Fluent.ViewModels.AddWallet.HardwareWallet
public ICommand NoCommand { get; }
- protected override void OnNavigatedTo(bool inStack, CompositeDisposable disposable)
+ protected override void OnNavigatedTo(bool inStack, CompositeDisposable disposables)
{
- base.OnNavigatedTo(inStack, disposable);
+ base.OnNavigatedTo(inStack, disposables);
Disposable.Create(() =>
{
CancelCts.Cancel();
CancelCts.Dispose();
})
- .DisposeWith(disposable);
+ .DisposeWith(disposables);
}
}
}

MODIFY
WalletWasabi.Fluent/ViewModels/AddWallet/LegalDocumentsViewModel.cs
WalletWasabi.Fluent/ViewModels/AddWallet/LegalDocumentsViewModel.cs
@@ -33,9 +33,9 @@ namespace WalletWasabi.Fluent.ViewModels.AddWallet
private LegalChecker LegalChecker { get; }
- protected override void OnNavigatedTo(bool inStack, CompositeDisposable disposable)
+ protected override void OnNavigatedTo(bool inStack, CompositeDisposable disposables)
{
- base.OnNavigatedTo(inStack, disposable);
+ base.OnNavigatedTo(inStack, disposables);
Observable.Merge(
Observable.FromEventPattern<LegalDocuments>(LegalChecker, nameof(LegalChecker.AgreedChanged)),
@@ -43,7 +43,7 @@ namespace WalletWasabi.Fluent.ViewModels.AddWallet
.Select(x => x.EventArgs)
.ObserveOn(RxApp.MainThreadScheduler)
.Subscribe(legalDocuments => Content = legalDocuments.Content)
- .DisposeWith(disposable);
+ .DisposeWith(disposables);
Content = LegalChecker.TryGetNewLegalDocs(out LegalDocuments? provisional)
? provisional.Content

MODIFY
WalletWasabi.Fluent/ViewModels/Login/PasswordFinder/SearchPasswordViewModel.cs
WalletWasabi.Fluent/ViewModels/Login/PasswordFinder/SearchPasswordViewModel.cs
@@ -30,9 +30,9 @@ namespace WalletWasabi.Fluent.ViewModels.Login.PasswordFinder
public PasswordFinderOptions Options { get; }
- protected override void OnNavigatedTo(bool inStack, CompositeDisposable disposable)
+ protected override void OnNavigatedTo(bool inStack, CompositeDisposable disposables)
{
- base.OnNavigatedTo(inStack, disposable);
+ base.OnNavigatedTo(inStack, disposables);
var cancelToken = new CancellationTokenSource();
@@ -43,7 +43,7 @@ namespace WalletWasabi.Fluent.ViewModels.Login.PasswordFinder
cancelToken.Cancel();
await t;
})
- .DisposeWith(disposable);
+ .DisposeWith(disposables);
}
private void FindPassword(PasswordFinderOptions options, CancellationToken token)

MODIFY
WalletWasabi.Fluent/ViewModels/Navigation/RoutableViewModel.cs
WalletWasabi.Fluent/ViewModels/Navigation/RoutableViewModel.cs
@@ -49,7 +49,7 @@ namespace WalletWasabi.Fluent.ViewModels.Navigation
OnNavigatedTo(inStack, _currentDisposable);
}
- protected virtual void OnNavigatedTo(bool inStack, CompositeDisposable disposable)
+ protected virtual void OnNavigatedTo(bool inStack, CompositeDisposable disposables)
{
}

MODIFY
WalletWasabi.Fluent/ViewModels/Settings/SettingsPageViewModel.cs
WalletWasabi.Fluent/ViewModels/Settings/SettingsPageViewModel.cs
@@ -39,14 +39,14 @@ namespace WalletWasabi.Fluent.ViewModels.Settings
IsModified = e.IsRestartNeeded;
}
- protected override void OnNavigatedTo(bool inStack, CompositeDisposable disposable)
+ protected override void OnNavigatedTo(bool inStack, CompositeDisposable disposables)
{
- base.OnNavigatedTo(inStack, disposable);
+ base.OnNavigatedTo(inStack, disposables);
SettingsTabViewModelBase.RestartNeeded += OnRestartNeeded;
Disposable.Create(() => SettingsTabViewModelBase.RestartNeeded -= OnRestartNeeded)
- .DisposeWith(disposable);
+ .DisposeWith(disposables);
}
}
}
\ No newline at end of file

MODIFY
WalletWasabi.Fluent/ViewModels/TriggerCommandViewModel.cs
WalletWasabi.Fluent/ViewModels/TriggerCommandViewModel.cs
@@ -8,14 +8,14 @@ namespace WalletWasabi.Fluent.ViewModels
{
public abstract ICommand TargetCommand { get; }
- protected override void OnNavigatedTo(bool inStack, CompositeDisposable disposable)
+ protected override void OnNavigatedTo(bool inStack, CompositeDisposable disposables)
{
if (TargetCommand.CanExecute(null))
{
TargetCommand.Execute(null);
}
Navigate().Back();
- base.OnNavigatedTo(inStack, disposable);
+ base.OnNavigatedTo(inStack, disposables);
}
}
}
\ No newline at end of file

rename disposable -> disposables.