wip

Wallet/AddItemNavigationViewModel.cs

@@ -6,6 +6,6 @@ public partial class AddItemNavigationViewModel(IServiceProvider provider,
     IServiceFactory factory,
     IMediator mediator,
     IPublisher publisher,
-    ISubscription subscriber,
+    ISubscriber subscriber,
     IDisposer disposer) : Observable(provider, factory, mediator, publisher, subscriber, disposer),
     IItemEntryViewModel;

Wallet/AllNavigationViewModel.cs

@@ -2,20 +2,19 @@
 
 namespace Wallet;
 
-[Notification(typeof(NotifyEventArgs<Item<int>>), "All")]
 public partial class AllNavigationViewModel(IServiceProvider provider,
     IServiceFactory factory, IMediator mediator,
-    IPublisher publisher, ISubscription subscriber, IDisposer disposer, int key, string value) :
+    IPublisher publisher, ISubscriber subscriber, IDisposer disposer, int key, string value) :
     FilterNavigationViewModel(provider, factory, mediator, publisher, subscriber, disposer, key, value),
     INotificationHandler<NotifyEventArgs<Item<int>>>
 {
-    public Task Handle(NotifyEventArgs<Item<int>> args)
-    {
-        if (args.Sender is Item<int> item)
-        {
-            Key = item.Value;
-        }
+    //public Task Handle(NotifyEventArgs<Item<int>> args)
+    //{
+    //    if (args.Sender is Item<int> item)
+    //    {
+    //        Key = item.Value;
+    //    }
 
-        return Task.CompletedTask;
-    }
+    //    return Task.CompletedTask;
+    //}
 }

Wallet/ArchiveItemActionViewModel.cs

@@ -7,7 +7,7 @@ public partial class ArchiveItemActionViewModel(IServiceProvider provider,
     IServiceFactory factory,
     IMediator mediator,
     IPublisher publisher,
-    ISubscription subscriber,
+    ISubscriber subscriber,
     IDisposer disposer) : Observable(provider, factory, mediator, publisher, subscriber, disposer),
     IRemovable
 {

Wallet/ArchiveNavigationViewModel.cs

@@ -7,7 +7,7 @@ public partial class ArchiveNavigationViewModel(IServiceProvider provider,
     IServiceFactory factory,
     IMediator mediator,
     IPublisher publisher,
-    ISubscription subscriber,
+    ISubscriber subscriber,
     IDisposer disposer,
     int key,
     string value) : FilterNavigationViewModel(provider, factory, mediator, publisher, subscriber, disposer, key, value),

Wallet/BackActionViewModel.cs

@@ -7,7 +7,7 @@ public partial class BackActionViewModel(IServiceProvider provider,
     IServiceFactory factory,
     IMediator mediator,
     IPublisher publisher,
-    ISubscription subscriber,
+    ISubscriber subscriber,
     IDisposer disposer) : Observable(provider, factory, mediator, publisher, subscriber, disposer)
 {
     [ObservableProperty]

Wallet/CategoriesNavigationViewModel.cs

@@ -7,7 +7,7 @@ public partial class CategoriesNavigationViewModel(IServiceProvider provider,
     IServiceFactory factory,
     IMediator mediator,
     IPublisher publisher,
-    ISubscription subscriber,
+    ISubscriber subscriber,
     IDisposer disposer,
     int key,
     string value) : FilterNavigationViewModel<CategoryNavigationViewModel>(provider, factory, mediator, publisher, subscriber, disposer, key, value);

Wallet/CategoryNavigationViewModel.cs

@@ -6,6 +6,6 @@ public partial class CategoryNavigationViewModel(IServiceProvider provider,
     IServiceFactory factory,
     IMediator mediator,
     IPublisher publisher,
-    ISubscription subscriber,
+    ISubscriber subscriber,
     IDisposer disposer,
     string value) : FilterNavigationViewModel(provider, factory, mediator, publisher, subscriber, disposer, 0, value);

Wallet/ConfirmItemActionViewModel.cs

@@ -7,7 +7,7 @@ public partial class ConfirmItemActionViewModel(IServiceProvider provider,
     IServiceFactory factory,
     IMediator mediator,
     IPublisher publisher,
-    ISubscription subscriber,
+    ISubscriber subscriber,
     IDisposer disposer) : Observable(provider, factory, mediator, publisher, subscriber, disposer)
 {
     [RelayCommand]

Wallet/CreateItemActionViewModel.cs

@@ -7,7 +7,7 @@ public partial class CreateItemActionViewModel(IServiceProvider provider,
     IServiceFactory factory,
     IMediator mediator,
     IPublisher publisher,
-    ISubscription subscriber,
+    ISubscriber subscriber,
     IDisposer disposer,
     NamedComponent named) : Observable(provider, factory, mediator, publisher, subscriber, disposer)
 {

Wallet/CreateWalletNavigationViewModel.cs

@@ -6,7 +6,7 @@ public partial class CreateWalletNavigationViewModel(IServiceProvider provider,
     IServiceFactory factory,
     IMediator mediator,
     IPublisher publisher,
-    ISubscription subscriber,
+    ISubscriber subscriber,
     IDisposer disposer) :
     Observable(provider, factory, mediator, publisher, subscriber, disposer),
     IMainNavigationViewModel;

Wallet/CreateWalletViewModel.cs

@@ -8,7 +8,7 @@ public partial class CreateWalletViewModel(IServiceProvider provider,
     IServiceFactory factory,
     IPublisher publisher,
     IMediator mediator,
-    ISubscription subscriber,
+    ISubscriber subscriber,
     IDisposer disposer) :
     Observable(provider, factory, mediator, publisher, subscriber, disposer),
     IPrimaryConfirmation

Wallet/DateEntryViewModel.cs

@@ -6,7 +6,7 @@ public partial class DateEntryViewModel(IServiceProvider provider,
     IServiceFactory factory,
     IMediator mediator,
     IPublisher publisher,
-    ISubscription subscriber,
+    ISubscriber subscriber,
     IDisposer disposer,
     ItemState state,
     ItemEntryConfiguration configuration,

Wallet/DeleteItemActionViewModel.cs

@@ -7,7 +7,7 @@ public partial class DeleteItemActionViewModel(IServiceProvider provider,
     IServiceFactory factory,
     IMediator mediator,
     IPublisher publisher,
-    ISubscription subscriber,
+    ISubscriber subscriber,
     IDisposer disposer) : Observable(provider, factory, mediator, publisher, subscriber, disposer)
 {
     [RelayCommand]

Wallet/DismissItemActionViewModel.cs

@@ -7,7 +7,7 @@ public partial class DismissItemActionViewModel(IServiceProvider provider,
     IServiceFactory factory,
     IMediator mediator,
     IPublisher publisher,
-    ISubscription subscriber,
+    ISubscriber subscriber,
     IDisposer disposer) : Observable(provider, factory, mediator, publisher, subscriber, disposer)
 {
     [RelayCommand]

Wallet/DropdownEntryViewModel.cs

@@ -9,7 +9,7 @@ public partial class DropdownEntryViewModel :
         IServiceFactory factory, 
         IMediator mediator,
         IPublisher publisher,
-        ISubscription subscriber,
+        ISubscriber subscriber,
         IDisposer disposer, 
         IEnumerable<DropdownValueViewModel> items,
         ItemState state, 
@@ -26,7 +26,7 @@ public partial class DropdownEntryViewModel :
         IServiceFactory factory,
         IMediator mediator,
         IPublisher publisher,
-        ISubscription subscriber,
+        ISubscriber subscriber,
         IDisposer disposer,
         IEnumerable<DropdownValueViewModel> items,
         ItemState state,

Wallet/DropdownValueViewModel.cs

@@ -6,6 +6,6 @@ public partial class DropdownValueViewModel(IServiceProvider provider,
     IServiceFactory factory,
     IMediator mediator,
     IPublisher publisher,
-    ISubscription subscriber,
+    ISubscriber subscriber,
     IDisposer disposer, 
     string? value = null) : Observable<string>(provider, factory, mediator, publisher, subscriber, disposer, value);

Wallet/EditItemActionViewModel.cs

@@ -7,7 +7,7 @@ public partial class EditItemActionViewModel(IServiceProvider provider,
     IServiceFactory factory,
     IMediator mediator,
     IPublisher publisher,
-    ISubscription subscriber,
+    ISubscriber subscriber,
     IDisposer disposer) : Observable(provider, factory, mediator, publisher, subscriber, disposer)
 {
     [RelayCommand]

Wallet/EmptyItemCollectionViewModel.cs

@@ -7,7 +7,7 @@ public partial class EmptyItemCollectionViewModel(IServiceProvider provider,
     IServiceFactory factory, 
     IMediator mediator, 
     IPublisher publisher,
-    ISubscription subscriber, 
+    ISubscriber subscriber, 
     IDisposer disposer,
     NamedComponent named) : Observable(provider, factory, mediator, publisher, subscriber, disposer)
 {

Wallet/FavouriteItemActionViewModel.cs

@@ -7,7 +7,7 @@ public partial class FavouriteItemActionViewModel(IServiceProvider provider,
     IServiceFactory factory,
     IMediator mediator,
     IPublisher publisher,
-    ISubscription subscriber,
+    ISubscriber subscriber,
     IDisposer disposer,
     bool value = false) : Observable<bool>(provider, factory, mediator, publisher, subscriber, disposer, value),
     IRemovable

Wallet/FilterNavigationViewModel.cs

@@ -3,11 +3,20 @@ using Toolkit.Foundation;
 
 namespace Wallet;
 
-public partial class FilterNavigationViewModel : 
-    ObservableCollection<IWalletNavigationViewModel, int, string>,
+[Notification(typeof(NotifyEventArgs<Item<int>>), nameof(Value))]
+public abstract partial class FilterNavigationViewModel(IServiceProvider provider,
+    IServiceFactory factory,
+    IMediator mediator,
+    IPublisher publisher,
+    ISubscriber subscriber,
+    IDisposer disposer,
+    int key,
+    string value) : 
+    ObservableCollection<IWalletNavigationViewModel, int, string>(provider, factory, mediator, publisher, subscriber, disposer, key, value),
     IWalletNavigationViewModel,
     INotificationHandler<ActivatedEventArgs<Wallet>>,
-    INotificationHandler<DeactivatedEventArgs<Wallet>>
+    INotificationHandler<DeactivatedEventArgs<Wallet>>,
+    INotificationHandler<NotifyEventArgs<Item<int>>>
 {
     [ObservableProperty]
     private bool activated;
@@ -15,16 +24,14 @@ public partial class FilterNavigationViewModel :
     [ObservableProperty]
     private bool selected;
 
-    public FilterNavigationViewModel(IServiceProvider provider, 
-        IServiceFactory factory, 
-        IMediator mediator, 
-        IPublisher publisher,
-        ISubscription subscriber,
-        IDisposer disposer,
-        int key, 
-        string value) : base(provider, factory, mediator, publisher, subscriber, disposer, key, value)
+    public Task Handle(NotifyEventArgs<Item<int>> args)
     {
+        if (args.Sender is Item<int> item)
+        {
+            Key = item.Value;
+        }
 
+        return Task.CompletedTask;
     }
 
     public Task Handle(DeactivatedEventArgs<Wallet> args) =>
@@ -34,8 +41,16 @@ public partial class FilterNavigationViewModel :
         Task.FromResult(Activated = true);
 }
 
-public partial class FilterNavigationViewModel<TWalletNavigation> :
-    ObservableCollection<TWalletNavigation, int, string>,
+[Notification(typeof(NotifyEventArgs<Item<int>>), nameof(Value))]
+public abstract partial class FilterNavigationViewModel<TWalletNavigation>(IServiceProvider provider,
+    IServiceFactory factory,
+    IMediator mediator,
+    IPublisher publisher,
+    ISubscriber subscriber,
+    IDisposer disposer,
+    int key,
+    string value) :
+    ObservableCollection<TWalletNavigation, int, string>(provider, factory, mediator, publisher, subscriber, disposer, key, value),
     IWalletNavigationViewModel,
     INotificationHandler<ActivatedEventArgs<Wallet>>,
     INotificationHandler<DeactivatedEventArgs<Wallet>>
@@ -48,18 +63,6 @@ public partial class FilterNavigationViewModel<TWalletNavigation> :
     [ObservableProperty]
     private bool selected;
 
-    public FilterNavigationViewModel(IServiceProvider provider,
-        IServiceFactory factory,
-        IMediator mediator, 
-        IPublisher publisher,
-        ISubscription subscriber, 
-        IDisposer disposer,
-        int key,
-        string value) : base(provider, factory, mediator, publisher, subscriber, disposer, key, value)
-    {
-
-    }
-
     public Task Handle(DeactivatedEventArgs<Wallet> args) =>
         Task.FromResult(Activated = false);
 

Wallet/FooterViewModel.cs

@@ -9,7 +9,7 @@ public partial class FooterViewModel :
         IServiceFactory factory,
         IMediator mediator,
         IPublisher publisher,
-        ISubscription subscriber,
+        ISubscriber subscriber,
         IDisposer disposer) : base(provider, factory, mediator, publisher, subscriber, disposer)
     {
         Add<ManageNavigationViewModel>();

Wallet/HyperlinkEntryViewModel.cs

@@ -7,7 +7,7 @@ public partial class HyperlinkEntryViewModel(IServiceProvider provider,
     IServiceFactory factory,
     IMediator mediator,
     IPublisher publisher,
-    ISubscription subscriber,
+    ISubscriber subscriber,
     IDisposer disposer,
     ItemState state,
     ItemEntryConfiguration configuration,

Wallet/IconViewModel.cs

@@ -8,7 +8,7 @@ public partial class IconViewModel : Observable
         IServiceFactory factory,
         IMediator mediator,
         IPublisher publisher,
-        ISubscription subscriber,
+        ISubscriber subscriber,
         IDisposer disposer) : base(provider, factory, mediator, publisher, subscriber, disposer)
     {
     }

Wallet/ItemCategoryCollectionViewModel.cs

@@ -8,7 +8,7 @@ public partial class ItemCategoryCollectionViewModel(IServiceProvider provider,
     IServiceFactory factory,
     IMediator mediator,
     IPublisher publisher,
-    ISubscription subscriber,
+    ISubscriber subscriber,
     IDisposer disposer,
     IContentTemplate template) :
     ObservableCollection<ItemCategoryNavigationViewModel>(provider, factory, mediator, publisher, subscriber, disposer)

Wallet/ItemCategoryNavigationViewModel.cs

@@ -8,7 +8,7 @@ public partial class ItemCategoryNavigationViewModel(IServiceProvider provider,
     IServiceFactory factory,
     IMediator mediator,
     IPublisher publisher,
-    ISubscription subscriber,
+    ISubscriber subscriber,
     IDisposer disposer,
     string name,
     bool selected = false) :

Wallet/ItemCollectionViewModel.cs

@@ -22,7 +22,7 @@ public partial class ItemCollectionViewModel :
         IServiceFactory factory,
         IMediator mediator,
         IPublisher publisher,
-        ISubscription subscriber,
+        ISubscriber subscriber,
         IDisposer disposer,
         IContentTemplate template,
         NamedComponent named,
@@ -42,7 +42,7 @@ public partial class ItemCollectionViewModel :
         if (args.Sender is Filter filter)
         {
             configuration = configuration with { Filter = filter.Value };
-            Fetch(true);
+            Synchronize(true);
         }
 
         return Task.CompletedTask;
@@ -53,7 +53,7 @@ public partial class ItemCollectionViewModel :
         if (args.Sender is Search<string> search)
         {
             configuration = configuration with { Query = search.Value };
-            Fetch(true);
+            Synchronize(true);
         }
 
         return Task.CompletedTask;
@@ -71,5 +71,5 @@ public partial class ItemCollectionViewModel :
     }
 
     protected override SynchronizeExpression BuildAggregateExpression() =>
-        new(Synchronize.As<ItemNavigationViewModel, ItemCollectionConfiguration>(configuration));
+        new(Toolkit.Foundation.Synchronize.As<ItemNavigationViewModel, ItemCollectionConfiguration>(configuration));
 }

Wallet/ItemCommandHeaderViewModel.cs

@@ -6,7 +6,7 @@ public partial class ItemCommandHeaderViewModel(IServiceProvider provider,
     IServiceFactory factory,
     IMediator mediator,
     IPublisher publisher,
-    ISubscription subscriber,
+    ISubscriber subscriber,
     IDisposer disposer,
     IContentTemplate template) :
     ObservableCollection(provider, factory, mediator, publisher, subscriber, disposer),

Wallet/ItemContentViewModel.cs

@@ -6,7 +6,7 @@ namespace Wallet;
 public partial class ItemContentViewModel(IServiceProvider provider,
     IServiceFactory factory, IMediator mediator,
     IPublisher publisher,
-    ISubscription subscriber,
+    ISubscriber subscriber,
     IDisposer disposer,
     IContentTemplate template) :
     ObservableCollection<ItemSectionViewModel>(provider, factory, mediator, publisher, subscriber, disposer),

Wallet/ItemEntryCollectionViewModel.cs

@@ -21,7 +21,7 @@ public partial class ItemEntryCollectionViewModel<TItem> :
         IServiceFactory factory,
         IMediator mediator,
         IPublisher publisher,
-        ISubscription subscriber,
+        ISubscriber subscriber,
         IDisposer disposer,
         ItemState state,
         ItemEntryConfiguration configuration,
@@ -43,7 +43,7 @@ public partial class ItemEntryCollectionViewModel<TItem> :
         IServiceFactory factory,
         IMediator mediator,
         IPublisher publisher,
-        ISubscription subscriber,
+        ISubscriber subscriber,
         IDisposer disposer,
         IEnumerable<TItem> items,
         ItemState state,

Wallet/ItemEntryViewModel.cs

@@ -7,7 +7,7 @@ public partial class ItemEntryViewModel<TValue>(IServiceProvider provider,
     IServiceFactory factory,
     IMediator mediator,
     IPublisher publisher,
-    ISubscription subscriber,
+    ISubscriber subscriber,
     IDisposer disposer,
     ItemState state,
     ItemEntryConfiguration configuration,

Wallet/ItemHeaderViewModel.cs

@@ -23,7 +23,7 @@ public partial class ItemHeaderViewModel :
         IServiceFactory factory,
         IMediator mediator,
         IPublisher publisher,
-        ISubscription subscriber,
+        ISubscriber subscriber,
         IDisposer disposer,
         ItemHeaderConfiguration configuration,
         ItemState state,

Wallet/ItemNavigationViewModel.cs

@@ -7,7 +7,7 @@ public partial class ItemNavigationViewModel(IServiceProvider provider,
     IServiceFactory factory,
     IMediator mediator,
     IPublisher publisher,
-    ISubscription subscriber,
+    ISubscriber subscriber,
     IDisposer disposer,
     IContentTemplate template,
     NamedComponent named,

Wallet/ItemSectionViewModel.cs

@@ -7,7 +7,7 @@ public partial class ItemSectionViewModel(IServiceProvider provider,
     IServiceFactory factory,
     IMediator mediator,
     IPublisher publisher,
-    ISubscription subscriber,
+    ISubscriber subscriber,
     IDisposer disposer,
     IContentTemplate template,
     string id) : ObservableCollection<IItemEntryViewModel>(provider, factory, mediator, publisher, subscriber, disposer),

Wallet/ItemViewModel.cs

@@ -31,7 +31,7 @@ public partial class ItemViewModel :
         IServiceFactory factory,
         IMediator mediator,
         IPublisher publisher,
-        ISubscription subscriber,
+        ISubscriber subscriber,
         IDisposer disposer,
         IContentTemplate template,
         NamedComponent named,
@@ -135,5 +135,5 @@ public partial class ItemViewModel :
     }
 
     protected override SynchronizeExpression BuildAggregateExpression() =>
-        new(Synchronize.As<IItemViewModel, (string, string, ItemState)>(("", Name, State)));
+        new(Toolkit.Foundation.Synchronize.As<IItemViewModel, (string, string, ItemState)>(("", Name, State)));
 }

Wallet/MainViewModel.cs

@@ -15,7 +15,7 @@ public partial class MainViewModel :
         IServiceFactory factory,
         IMediator mediator,
         IPublisher publisher,
-        ISubscription subscriber,
+        ISubscriber subscriber,
         IDisposer disposer,
         IContentTemplate template,
         FooterViewModel footer) : base(provider, factory, mediator, publisher, subscriber, disposer)

Wallet/MainWindowViewModel.cs

@@ -6,6 +6,6 @@ public class MainWindowViewModel(IServiceProvider provider,
     IServiceFactory factory,
     IMediator mediator,
     IPublisher publisher,
-    ISubscription subscriber,
+    ISubscriber subscriber,
     IDisposer disposer) :
     Observable(provider, factory, mediator, publisher, subscriber, disposer);

Wallet/ManageNavigationViewModel.cs

@@ -6,7 +6,7 @@ public partial class ManageNavigationViewModel(IServiceProvider provider,
     IServiceFactory factory,
     IMediator mediator,
     IPublisher publisher,
-    ISubscription subscriber,
+    ISubscriber subscriber,
     IDisposer disposer) :
     Observable(provider, factory, mediator, publisher, subscriber, disposer),
     IMainNavigationViewModel;

Wallet/ManageViewModel.cs

@@ -10,7 +10,7 @@ public partial class ManageViewModel :
         IServiceFactory factory,
         IMediator mediator,
         IPublisher publisher,
-        ISubscription subscriber,
+        ISubscriber subscriber,
         IDisposer disposer,
         IContentTemplate template) : base(provider, factory, mediator, publisher, subscriber, disposer)
     {

Wallet/MaskedTextEntryViewModel.cs

@@ -7,7 +7,7 @@ public partial class MaskedTextEntryViewModel(IServiceProvider provider,
     IServiceFactory factory,
     IMediator mediator,
     IPublisher publisher,
-    ISubscription subscriber,
+    ISubscriber subscriber,
     IDisposer disposer,
     ItemState state,
     ItemEntryConfiguration configuration,

Wallet/MultilineTextEntryViewModel.cs

@@ -6,7 +6,7 @@ public partial class MultilineTextEntryViewModel(IServiceProvider provider,
     IServiceFactory factory,
     IMediator mediator,
     IPublisher publisher,
-    ISubscription subscriber,
+    ISubscriber subscriber,
     IDisposer disposer,
     ItemState state,
     ItemEntryConfiguration configuration,

Wallet/OpenWalletViewModel.cs

@@ -8,7 +8,7 @@ public partial class OpenWalletViewModel(IServiceProvider provider,
     IServiceFactory factory,
     IMediator mediator,
     IPublisher publisher,
-    ISubscription subscriber,
+    ISubscriber subscriber,
     IDisposer disposer,
     string name) :
     Observable(provider, factory, mediator, publisher, subscriber, disposer)

Wallet/PasswordEntryViewModel.cs

@@ -6,7 +6,7 @@ public partial class PasswordEntryViewModel(IServiceProvider provider,
     IServiceFactory factory,
     IMediator mediator,
     IPublisher publisher,
-    ISubscription subscriber,
+    ISubscriber subscriber,
     IDisposer disposer,
     ItemState state,
     ItemEntryConfiguration configuration,

Wallet/PinEntryViewModel.cs

@@ -6,7 +6,7 @@ public partial class PinEntryViewModel(IServiceProvider provider,
     IServiceFactory factory,
     IMediator mediator,
     IPublisher publisher,
-    ISubscription subscriber,
+    ISubscriber subscriber,
     IDisposer disposer,
     ItemState state,
     ItemEntryConfiguration configuration,

Wallet/SearchWalletActionViewModel.cs

@@ -8,7 +8,7 @@ public partial class SearchWalletActionViewModel(IServiceProvider provider,
     IServiceFactory factory,
     IMediator mediator,
     IPublisher publisher,
-    ISubscription subscriber,
+    ISubscriber subscriber,
     IDisposer disposer) : Observable<string>(provider, factory, mediator, publisher, subscriber, disposer, "")
 {
     [ObservableProperty]

Wallet/StarredNavigationViewModel.cs

@@ -2,24 +2,14 @@
 
 namespace Wallet;
 
-[Notification(typeof(NotifyEventArgs<Item<int>>), "Favourites")]
 public partial class StarredNavigationViewModel(IServiceProvider provider,
     IServiceFactory factory,
     IMediator mediator,
     IPublisher publisher,
-    ISubscription subscriber,
+    ISubscriber subscriber,
     IDisposer disposer,
     int key,
-    string value) : FilterNavigationViewModel(provider, factory, mediator, publisher, subscriber, disposer, key, value),
-    INotificationHandler<NotifyEventArgs<Item<int>>>
+    string value) : FilterNavigationViewModel(provider, factory, mediator, publisher, subscriber, disposer, key, value)
 {
-    public Task Handle(NotifyEventArgs<Item<int>> args)
-    {
-        if (args.Sender is Item<int> item)
-        {
-            Key = item.Value;
-        }
 
-        return Task.CompletedTask;
-    }
 }

Wallet/SynchronizeMainViewModelHandler.cs

@@ -19,7 +19,13 @@ public class SynchronizeMainViewModelHandler(IPublisher publisher,
             {
                 if (Wallet.Services.GetRequiredService<IServiceFactory>() is IServiceFactory factory)
                 {
-                    if (factory.Create<WalletNavigationViewModel>(descriptor.Name, selected) 
+                    if (factory.Create<WalletNavigationViewModel>(args =>
+                    {
+                        if (args is IPostInitialization initialization)
+                        {
+                            initialization.PostInitialize();
+                        }
+                    },  descriptor.Name, selected) 
                         is WalletNavigationViewModel viewModel)
                     {
                         publisher.Publish(Create.As<IMainNavigationViewModel>(viewModel),

Wallet/TextEntryViewModel.cs

@@ -6,7 +6,7 @@ public partial class TextEntryViewModel(IServiceProvider provider,
     IServiceFactory factory,
     IMediator mediator,
     IPublisher publisher,
-    ISubscription subscriber,
+    ISubscriber subscriber,
     IDisposer disposer,
     ItemState state,
     ItemEntryConfiguration configuration,

Wallet/UnarchiveItemActionViewModel.cs

@@ -7,7 +7,7 @@ public partial class UnarchiveItemActionViewModel(IServiceProvider provider,
     IServiceFactory factory,
     IMediator mediator,
     IPublisher publisher,
-    ISubscription subscriber,
+    ISubscriber subscriber,
     IDisposer disposer) : Observable(provider, factory, mediator, publisher, subscriber, disposer),
     IRemovable
 {

Wallet/UnfavouriteItemActionViewModel.cs

@@ -7,7 +7,7 @@ public partial class UnfavouriteItemActionViewModel(IServiceProvider provider,
     IServiceFactory factory,
     IMediator mediator,
     IPublisher publisher,
-    ISubscription subscriber,
+    ISubscriber subscriber,
     IDisposer disposer) : Observable(provider, factory, mediator, publisher, subscriber, disposer),
     IRemovable
 {

Wallet/WalletHeaderViewModel.cs

@@ -6,7 +6,7 @@ public partial class WalletHeaderViewModel(IServiceProvider provider,
     IServiceFactory factory,
     IMediator mediator,
     IPublisher publisher,
-    ISubscription subscriber,
+    ISubscriber subscriber,
     IDisposer disposer,
     IContentTemplate template) :
     ObservableCollection(provider, factory, mediator, publisher, subscriber, disposer),

Wallet/WalletInitializer.cs

@@ -4,7 +4,7 @@ namespace Wallet;
 
 public class WalletInitializer(IEnumerable<IConfigurationDescriptor<WalletConfiguration>> configurations,
     IComponentFactory componentFactory,
-    IWalletHostCollection Wallets) : IInitializer
+    IWalletHostCollection Wallets) : IInitialization
 {
     public async Task Initialize()
     {

Wallet/WalletNavigationViewModel.cs

@@ -31,7 +31,7 @@ public partial class WalletNavigationViewModel :
         IServiceFactory factory,
         IMediator mediator,
         IPublisher publisher,
-        ISubscription subscriber,
+        ISubscriber subscriber,
         IDisposer disposer,
         IContentTemplate template,
         string name,

Wallet/WalletViewModel.cs

@@ -16,7 +16,7 @@ public partial class WalletViewModel :
         IServiceFactory factory,
         IMediator mediator,
         IPublisher publisher,
-        ISubscription subscriber,
+        ISubscriber subscriber,
         IDisposer disposer,
         NamedComponent named,
         string filter) : base(provider, factory, mediator, publisher, subscriber, disposer)