Remove redundant WalletActionViewModel class.
MODIFY
WalletWasabi.Gui/Controls/WalletExplorer/CoinJoinTabViewModel.cs
WalletWasabi.Gui/Controls/WalletExplorer/CoinJoinTabViewModel.cs
@@ -25,7 +25,7 @@ using WalletWasabi.Services;
namespace WalletWasabi.Gui.Controls.WalletExplorer
{
- public class CoinJoinTabViewModel : WalletActionViewModel
+ public class CoinJoinTabViewModel : WasabiDocumentTabViewModel
{
private long _roundId;
private RoundPhaseState _roundPhaseState;

MODIFY
WalletWasabi.Gui/Controls/WalletExplorer/HistoryTabViewModel.cs
WalletWasabi.Gui/Controls/WalletExplorer/HistoryTabViewModel.cs
@@ -11,13 +11,14 @@ using System.Reactive.Linq;
using System.Threading.Tasks;
using WalletWasabi.Blockchain.Transactions;
using WalletWasabi.Gui.Helpers;
+using WalletWasabi.Gui.ViewModels;
using WalletWasabi.Logging;
using WalletWasabi.Models;
using WalletWasabi.Services;
namespace WalletWasabi.Gui.Controls.WalletExplorer
{
- public class HistoryTabViewModel : WalletActionViewModel
+ public class HistoryTabViewModel : WasabiDocumentTabViewModel
{
private CompositeDisposable Disposables { get; set; }

MODIFY
WalletWasabi.Gui/Controls/WalletExplorer/ReceiveTabViewModel.cs
WalletWasabi.Gui/Controls/WalletExplorer/ReceiveTabViewModel.cs
@@ -23,7 +23,7 @@ using WalletWasabi.Services;
namespace WalletWasabi.Gui.Controls.WalletExplorer
{
- public class ReceiveTabViewModel : WalletActionViewModel
+ public class ReceiveTabViewModel : WasabiDocumentTabViewModel
{
private CompositeDisposable Disposables { get; set; }

MODIFY
WalletWasabi.Gui/Controls/WalletExplorer/SendControlViewModel.cs
WalletWasabi.Gui/Controls/WalletExplorer/SendControlViewModel.cs
@@ -40,7 +40,7 @@ using WalletWasabi.Services;
namespace WalletWasabi.Gui.Controls.WalletExplorer
{
- public abstract class SendControlViewModel : WalletActionViewModel
+ public abstract class SendControlViewModel : WasabiDocumentTabViewModel
{
private CompositeDisposable Disposables { get; set; }

MODIFY
WalletWasabi.Gui/Controls/WalletExplorer/TransactionViewerViewModel.cs
WalletWasabi.Gui/Controls/WalletExplorer/TransactionViewerViewModel.cs
@@ -16,12 +16,13 @@ using System.Runtime.InteropServices;
using System.Threading.Tasks;
using WalletWasabi.Blockchain.TransactionBuilding;
using WalletWasabi.Gui.Helpers;
+using WalletWasabi.Gui.ViewModels;
using WalletWasabi.Logging;
using WalletWasabi.Models;
namespace WalletWasabi.Gui.Controls.WalletExplorer
{
- public class TransactionViewerViewModel : WalletActionViewModel
+ public class TransactionViewerViewModel : WasabiDocumentTabViewModel
{
private string _txId;
private string _psbtJsonText;

DELETE
WalletWasabi.Gui/Controls/WalletExplorer/WalletActionViewModel.cs
-using WalletWasabi.Gui.ViewModels;
-
-namespace WalletWasabi.Gui.Controls.WalletExplorer
-{
- public class WalletActionViewModel : WasabiDocumentTabViewModel
- {
- public WalletActionViewModel(string title)
- : base(title)
- {
- }
- }
-}

MODIFY
WalletWasabi.Gui/Controls/WalletExplorer/WalletAdvancedViewModel.cs
WalletWasabi.Gui/Controls/WalletExplorer/WalletAdvancedViewModel.cs
@@ -6,12 +6,13 @@ using WalletWasabi.Logging;
using System;
using System.IO;
using WalletWasabi.Services;
+using WalletWasabi.Gui.ViewModels;
namespace WalletWasabi.Gui.Controls.WalletExplorer
{
- public class WalletAdvancedViewModel : WalletActionViewModel
+ public class WalletAdvancedViewModel : WasabiDocumentTabViewModel
{
- private ObservableCollection<WalletActionViewModel> _items;
+ private ObservableCollection<WasabiDocumentTabViewModel> _items;
private bool _isExpanded;
@@ -25,7 +26,7 @@ namespace WalletWasabi.Gui.Controls.WalletExplorer
public WalletAdvancedViewModel(WalletService walletService) : base(Path.GetFileNameWithoutExtension(walletService.KeyManager.FilePath))
{
- Items = new ObservableCollection<WalletActionViewModel>();
+ Items = new ObservableCollection<WasabiDocumentTabViewModel>();
ExpandItCommand = ReactiveCommand.Create(() => IsExpanded = !IsExpanded);
@@ -34,7 +35,7 @@ namespace WalletWasabi.Gui.Controls.WalletExplorer
.Subscribe(ex => Logger.LogError(ex));
}
- public ObservableCollection<WalletActionViewModel> Items
+ public ObservableCollection<WasabiDocumentTabViewModel> Items
{
get => _items;
set => this.RaiseAndSetIfChanged(ref _items, value);

MODIFY
WalletWasabi.Gui/Controls/WalletExplorer/WalletInfoViewModel.cs
WalletWasabi.Gui/Controls/WalletExplorer/WalletInfoViewModel.cs
@@ -16,10 +16,11 @@ using WalletWasabi.Logging;
using System.Reactive.Linq;
using Splat;
using System.IO;
+using WalletWasabi.Gui.ViewModels;
namespace WalletWasabi.Gui.Controls.WalletExplorer
{
- public class WalletInfoViewModel : WalletActionViewModel
+ public class WalletInfoViewModel : WasabiDocumentTabViewModel
{
private CompositeDisposable Disposables { get; set; }

MODIFY
WalletWasabi.Gui/Controls/WalletExplorer/WalletViewModel.cs
WalletWasabi.Gui/Controls/WalletExplorer/WalletViewModel.cs
@@ -18,7 +18,7 @@ namespace WalletWasabi.Gui.Controls.WalletExplorer
{
private CompositeDisposable Disposables { get; set; }
- private ObservableCollection<WalletActionViewModel> _actions;
+ private ObservableCollection<WasabiDocumentTabViewModel> _actions;
private bool _isExpanded;
@@ -46,7 +46,7 @@ namespace WalletWasabi.Gui.Controls.WalletExplorer
var keyManager = WalletService.KeyManager;
Name = Path.GetFileNameWithoutExtension(keyManager.FilePath);
- Actions = new ObservableCollection<WalletActionViewModel>();
+ Actions = new ObservableCollection<WasabiDocumentTabViewModel>();
SendTabViewModel sendTab = null;
// If hardware wallet then we need the Send tab.
@@ -91,7 +91,7 @@ namespace WalletWasabi.Gui.Controls.WalletExplorer
}
else
{
- WalletActionViewModel tabToOpen = global.UiConfig.LastActiveTab switch
+ WasabiDocumentTabViewModel tabToOpen = global.UiConfig.LastActiveTab switch
{
nameof(SendTabViewModel) => sendTab,
nameof(ReceiveTabViewModel) => receiveTab,
@@ -153,7 +153,7 @@ namespace WalletWasabi.Gui.Controls.WalletExplorer
public ReactiveCommand<Unit, Unit> LurkingWifeModeCommand { get; }
- public ObservableCollection<WalletActionViewModel> Actions
+ public ObservableCollection<WasabiDocumentTabViewModel> Actions
{
get => _actions;
set => this.RaiseAndSetIfChanged(ref _actions, value);

Remove redundant WalletActionViewModel class.