diff --git a/lib/redux/company_gateway/company_gateway_reducer.dart b/lib/redux/company_gateway/company_gateway_reducer.dart
index 464b7a00f..7f2b58214 100644
--- a/lib/redux/company_gateway/company_gateway_reducer.dart
+++ b/lib/redux/company_gateway/company_gateway_reducer.dart
@@ -35,6 +35,8 @@ final forceSelectedReducer = combineReducers<bool>([
 ]);
 
 Reducer<String> selectedIdReducer = combineReducers([
+  TypedReducer<String, ArchiveCompanyGatewaySuccess>((completer, action) => ''),
+  TypedReducer<String, DeleteCompanyGatewaySuccess>((completer, action) => ''),
   TypedReducer<String, PreviewEntity>((selectedId, action) =>
       action.entityType == EntityType.companyGateway
           ? action.entityId
diff --git a/lib/redux/credit/credit_reducer.dart b/lib/redux/credit/credit_reducer.dart
index 4cf14ea95..0eeda6d5f 100644
--- a/lib/redux/credit/credit_reducer.dart
+++ b/lib/redux/credit/credit_reducer.dart
@@ -60,6 +60,8 @@ String filtercreditDropdownReducer(
 }
 
 Reducer<String> selectedIdReducer = combineReducers([
+  TypedReducer<String, ArchiveCreditsSuccess>((completer, action) => ''),
+  TypedReducer<String, DeleteCreditsSuccess>((completer, action) => ''),
   TypedReducer<String, PreviewEntity>((selectedId, action) =>
       action.entityType == EntityType.credit ? action.entityId : selectedId),
   TypedReducer<String, ViewCredit>((selectedId, action) => action.creditId),
diff --git a/lib/redux/design/design_reducer.dart b/lib/redux/design/design_reducer.dart
index d7ee2419e..d8d0f6db2 100644
--- a/lib/redux/design/design_reducer.dart
+++ b/lib/redux/design/design_reducer.dart
@@ -28,6 +28,8 @@ final forceSelectedReducer = combineReducers<bool>([
 ]);
 
 Reducer<String> selectedIdReducer = combineReducers([
+  TypedReducer<String, ArchiveDesignsSuccess>((completer, action) => ''),
+  TypedReducer<String, DeleteDesignsSuccess>((completer, action) => ''),
   TypedReducer<String, PreviewEntity>((selectedId, action) =>
       action.entityType == EntityType.design ? action.entityId : selectedId),
   TypedReducer<String, ViewDesign>(
diff --git a/lib/redux/document/document_reducer.dart b/lib/redux/document/document_reducer.dart
index 3ff91e0e3..949f7c113 100644
--- a/lib/redux/document/document_reducer.dart
+++ b/lib/redux/document/document_reducer.dart
@@ -28,6 +28,8 @@ final forceSelectedReducer = combineReducers<bool>([
 ]);
 
 Reducer<String> selectedIdReducer = combineReducers([
+  TypedReducer<String, ArchiveDocumentSuccess>((completer, action) => ''),
+  TypedReducer<String, DeleteDocumentSuccess>((completer, action) => ''),
   TypedReducer<String, PreviewEntity>((selectedId, action) =>
       action.entityType == EntityType.document ? action.entityId : selectedId),
   TypedReducer<String, ViewDocument>((selectedId, action) => action.documentId),
diff --git a/lib/redux/expense/expense_reducer.dart b/lib/redux/expense/expense_reducer.dart
index 23259def9..efaf8fd5c 100644
--- a/lib/redux/expense/expense_reducer.dart
+++ b/lib/redux/expense/expense_reducer.dart
@@ -38,6 +38,8 @@ final tabIndexReducer = combineReducers<int>([
 ]);
 
 Reducer<String> selectedIdReducer = combineReducers([
+  TypedReducer<String, ArchiveExpenseSuccess>((completer, action) => ''),
+  TypedReducer<String, DeleteExpenseSuccess>((completer, action) => ''),
   TypedReducer<String, PreviewEntity>((selectedId, action) =>
       action.entityType == EntityType.expense ? action.entityId : selectedId),
   TypedReducer<String, ViewExpense>((selectedId, action) => action.expenseId),
diff --git a/lib/redux/expense_category/expense_category_reducer.dart b/lib/redux/expense_category/expense_category_reducer.dart
index 618c7c086..8a924fefe 100644
--- a/lib/redux/expense_category/expense_category_reducer.dart
+++ b/lib/redux/expense_category/expense_category_reducer.dart
@@ -35,6 +35,10 @@ final forceSelectedReducer = combineReducers<bool>([
 ]);
 
 Reducer<String> selectedIdReducer = combineReducers([
+  TypedReducer<String, ArchiveExpenseCategoriesSuccess>(
+      (completer, action) => ''),
+  TypedReducer<String, DeleteExpenseCategoriesSuccess>(
+      (completer, action) => ''),
   TypedReducer<String, PreviewEntity>((selectedId, action) =>
       action.entityType == EntityType.expenseCategory
           ? action.entityId
diff --git a/lib/redux/group/group_reducer.dart b/lib/redux/group/group_reducer.dart
index 18a92e7d8..cce0f8967 100644
--- a/lib/redux/group/group_reducer.dart
+++ b/lib/redux/group/group_reducer.dart
@@ -27,6 +27,8 @@ final forceSelectedReducer = combineReducers<bool>([
 ]);
 
 Reducer<String> selectedIdReducer = combineReducers([
+  TypedReducer<String, ArchiveGroupSuccess>((completer, action) => ''),
+  TypedReducer<String, DeleteGroupSuccess>((completer, action) => ''),
   TypedReducer<String, PreviewEntity>((selectedId, action) =>
       action.entityType == EntityType.group ? action.entityId : selectedId),
   TypedReducer<String, ViewGroup>(
diff --git a/lib/redux/invoice/invoice_reducer.dart b/lib/redux/invoice/invoice_reducer.dart
index d2823aa70..a40ea63cc 100644
--- a/lib/redux/invoice/invoice_reducer.dart
+++ b/lib/redux/invoice/invoice_reducer.dart
@@ -62,6 +62,8 @@ String filterInvoiceDropdownReducer(
 }
 
 Reducer<String> selectedIdReducer = combineReducers([
+  TypedReducer<String, ArchiveInvoicesSuccess>((completer, action) => ''),
+  TypedReducer<String, DeleteInvoicesSuccess>((completer, action) => ''),
   TypedReducer<String, PreviewEntity>((selectedId, action) =>
       action.entityType == EntityType.invoice ? action.entityId : selectedId),
   TypedReducer<String, ViewInvoice>((selectedId, action) => action.invoiceId),
diff --git a/lib/redux/payment/payment_reducer.dart b/lib/redux/payment/payment_reducer.dart
index 98da5d75c..4ca075292 100644
--- a/lib/redux/payment/payment_reducer.dart
+++ b/lib/redux/payment/payment_reducer.dart
@@ -38,6 +38,8 @@ final tabIndexReducer = combineReducers<int>([
 ]);
 
 Reducer<String> selectedIdReducer = combineReducers([
+  TypedReducer<String, ArchivePaymentsSuccess>((completer, action) => ''),
+  TypedReducer<String, DeletePaymentsSuccess>((completer, action) => ''),
   TypedReducer<String, PreviewEntity>((selectedId, action) =>
       action.entityType == EntityType.payment ? action.entityId : selectedId),
   TypedReducer<String, ViewPayment>((selectedId, action) => action.paymentId),
diff --git a/lib/redux/payment_term/payment_term_reducer.dart b/lib/redux/payment_term/payment_term_reducer.dart
index d7e41c450..18e7300e5 100644
--- a/lib/redux/payment_term/payment_term_reducer.dart
+++ b/lib/redux/payment_term/payment_term_reducer.dart
@@ -29,6 +29,8 @@ final forceSelectedReducer = combineReducers<bool>([
 ]);
 
 Reducer<String> selectedIdReducer = combineReducers([
+  TypedReducer<String, ArchivePaymentTermsSuccess>((completer, action) => ''),
+  TypedReducer<String, DeletePaymentTermsSuccess>((completer, action) => ''),
   TypedReducer<String, PreviewEntity>((selectedId, action) =>
       action.entityType == EntityType.paymentTerm
           ? action.entityId
diff --git a/lib/redux/product/product_reducer.dart b/lib/redux/product/product_reducer.dart
index b3a555539..41efea85e 100644
--- a/lib/redux/product/product_reducer.dart
+++ b/lib/redux/product/product_reducer.dart
@@ -75,6 +75,8 @@ ProductEntity _updateEditing(ProductEntity product, dynamic action) {
 }
 
 Reducer<String> selectedIdReducer = combineReducers([
+  TypedReducer<String, ArchiveProductsSuccess>((completer, action) => ''),
+  TypedReducer<String, DeleteProductsSuccess>((completer, action) => ''),
   TypedReducer<String, PreviewEntity>((selectedId, action) =>
       action.entityType == EntityType.product ? action.entityId : selectedId),
   TypedReducer<String, ViewProduct>((selectedId, action) => action.productId),
diff --git a/lib/redux/project/project_reducer.dart b/lib/redux/project/project_reducer.dart
index c6897a19c..850088ea8 100644
--- a/lib/redux/project/project_reducer.dart
+++ b/lib/redux/project/project_reducer.dart
@@ -54,6 +54,8 @@ final cancelCompleterReducer = combineReducers<Completer<SelectableEntity>>([
 ]);
 
 Reducer<String> selectedIdReducer = combineReducers([
+  TypedReducer<String, ArchiveProjectSuccess>((completer, action) => ''),
+  TypedReducer<String, DeleteProjectSuccess>((completer, action) => ''),
   TypedReducer<String, PreviewEntity>((selectedId, action) =>
       action.entityType == EntityType.project ? action.entityId : selectedId),
   TypedReducer<String, ViewProject>((selectedId, action) => action.projectId),
diff --git a/lib/redux/quote/quote_reducer.dart b/lib/redux/quote/quote_reducer.dart
index 3a28c455c..d0fa9322d 100644
--- a/lib/redux/quote/quote_reducer.dart
+++ b/lib/redux/quote/quote_reducer.dart
@@ -61,6 +61,8 @@ String filterquoteDropdownReducer(
 }
 
 Reducer<String> selectedIdReducer = combineReducers([
+  TypedReducer<String, ArchiveQuotesSuccess>((completer, action) => ''),
+  TypedReducer<String, DeleteQuotesSuccess>((completer, action) => ''),
   TypedReducer<String, PreviewEntity>((selectedId, action) =>
       action.entityType == EntityType.quote ? action.entityId : selectedId),
   TypedReducer<String, ViewQuote>((selectedId, action) => action.quoteId),
diff --git a/lib/redux/recurring_invoice/recurring_invoice_reducer.dart b/lib/redux/recurring_invoice/recurring_invoice_reducer.dart
index 64c175e1f..c7e4a0276 100644
--- a/lib/redux/recurring_invoice/recurring_invoice_reducer.dart
+++ b/lib/redux/recurring_invoice/recurring_invoice_reducer.dart
@@ -70,6 +70,10 @@ String filterRecurringInvoiceDropdownReducer(
 }
 
 Reducer<String> selectedIdReducer = combineReducers([
+  TypedReducer<String, ArchiveRecurringInvoicesSuccess>(
+      (completer, action) => ''),
+  TypedReducer<String, DeleteRecurringInvoicesSuccess>(
+      (completer, action) => ''),
   TypedReducer<String, PreviewEntity>((selectedId, action) =>
       action.entityType == EntityType.recurringInvoice
           ? action.entityId
diff --git a/lib/redux/subscription/subscription_reducer.dart b/lib/redux/subscription/subscription_reducer.dart
index d79f3d252..ab40308fe 100644
--- a/lib/redux/subscription/subscription_reducer.dart
+++ b/lib/redux/subscription/subscription_reducer.dart
@@ -43,6 +43,8 @@ final tabIndexReducer = combineReducers<int>([
 ]);
 
 Reducer<String> selectedIdReducer = combineReducers([
+  TypedReducer<String, ArchiveSubscriptionsSuccess>((completer, action) => ''),
+  TypedReducer<String, DeleteSubscriptionsSuccess>((completer, action) => ''),
   TypedReducer<String, PreviewEntity>((selectedId, action) =>
       action.entityType == EntityType.subscription
           ? action.entityId
diff --git a/lib/redux/task/task_reducer.dart b/lib/redux/task/task_reducer.dart
index 96f9bada0..639a43185 100644
--- a/lib/redux/task/task_reducer.dart
+++ b/lib/redux/task/task_reducer.dart
@@ -57,6 +57,8 @@ TaskTime editTaskTime(TaskTime taskTime, dynamic action) {
  */
 
 Reducer<String> selectedIdReducer = combineReducers([
+  TypedReducer<String, ArchiveTaskSuccess>((completer, action) => ''),
+  TypedReducer<String, DeleteTaskSuccess>((completer, action) => ''),
   TypedReducer<String, PreviewEntity>((selectedId, action) =>
       action.entityType == EntityType.task ? action.entityId : selectedId),
   TypedReducer<String, ViewTask>((selectedId, action) => action.taskId),
diff --git a/lib/redux/task_status/task_status_reducer.dart b/lib/redux/task_status/task_status_reducer.dart
index 7fa883b14..55a87c869 100644
--- a/lib/redux/task_status/task_status_reducer.dart
+++ b/lib/redux/task_status/task_status_reducer.dart
@@ -30,6 +30,8 @@ final forceSelectedReducer = combineReducers<bool>([
 ]);
 
 Reducer<String> selectedIdReducer = combineReducers([
+  TypedReducer<String, ArchiveTaskStatusesSuccess>((completer, action) => ''),
+  TypedReducer<String, DeleteTaskStatusesSuccess>((completer, action) => ''),
   TypedReducer<String, PreviewEntity>((selectedId, action) =>
       action.entityType == EntityType.taskStatus
           ? action.entityId
diff --git a/lib/redux/tax_rate/tax_rate_reducer.dart b/lib/redux/tax_rate/tax_rate_reducer.dart
index 19129bcd3..904e5a6f7 100644
--- a/lib/redux/tax_rate/tax_rate_reducer.dart
+++ b/lib/redux/tax_rate/tax_rate_reducer.dart
@@ -26,6 +26,8 @@ final forceSelectedReducer = combineReducers<bool>([
 ]);
 
 Reducer<String> selectedIdReducer = combineReducers([
+  TypedReducer<String, ArchiveTaxRatesSuccess>((completer, action) => ''),
+  TypedReducer<String, DeleteTaxRatesSuccess>((completer, action) => ''),
   TypedReducer<String, PreviewEntity>((selectedId, action) =>
       action.entityType == EntityType.taxRate ? action.entityId : selectedId),
   TypedReducer<String, ViewTaxRate>(
diff --git a/lib/redux/token/token_reducer.dart b/lib/redux/token/token_reducer.dart
index 0a45be27e..8fed51d4e 100644
--- a/lib/redux/token/token_reducer.dart
+++ b/lib/redux/token/token_reducer.dart
@@ -29,6 +29,8 @@ final forceSelectedReducer = combineReducers<bool>([
 ]);
 
 Reducer<String> selectedIdReducer = combineReducers([
+  TypedReducer<String, ArchiveTokensSuccess>((completer, action) => ''),
+  TypedReducer<String, DeleteTokensSuccess>((completer, action) => ''),
   TypedReducer<String, PreviewEntity>((selectedId, action) =>
       action.entityType == EntityType.token ? action.entityId : selectedId),
   TypedReducer<String, ViewToken>(
diff --git a/lib/redux/user/user_reducer.dart b/lib/redux/user/user_reducer.dart
index 12c8f0acd..585be79e4 100644
--- a/lib/redux/user/user_reducer.dart
+++ b/lib/redux/user/user_reducer.dart
@@ -30,6 +30,8 @@ final forceSelectedReducer = combineReducers<bool>([
 ]);
 
 Reducer<String> selectedIdReducer = combineReducers([
+  TypedReducer<String, ArchiveUserSuccess>((completer, action) => ''),
+  TypedReducer<String, DeleteUserSuccess>((completer, action) => ''),
   TypedReducer<String, PreviewEntity>((selectedId, action) =>
       action.entityType == EntityType.user ? action.entityId : selectedId),
   TypedReducer<String, ViewUser>((String selectedId, action) => action.userId),
diff --git a/lib/redux/vendor/vendor_reducer.dart b/lib/redux/vendor/vendor_reducer.dart
index 1cf4eaf30..b8a43896f 100644
--- a/lib/redux/vendor/vendor_reducer.dart
+++ b/lib/redux/vendor/vendor_reducer.dart
@@ -66,6 +66,8 @@ VendorContactEntity editVendorContact(
 }
 
 Reducer<String> selectedIdReducer = combineReducers([
+  TypedReducer<String, ArchiveVendorSuccess>((completer, action) => ''),
+  TypedReducer<String, DeleteVendorSuccess>((completer, action) => ''),
   TypedReducer<String, PreviewEntity>((selectedId, action) =>
       action.entityType == EntityType.vendor ? action.entityId : selectedId),
   TypedReducer<String, ViewVendor>((selectedId, action) => action.vendorId),
diff --git a/lib/redux/webhook/webhook_reducer.dart b/lib/redux/webhook/webhook_reducer.dart
index 42bd209f4..be9410521 100644
--- a/lib/redux/webhook/webhook_reducer.dart
+++ b/lib/redux/webhook/webhook_reducer.dart
@@ -29,6 +29,8 @@ final forceSelectedReducer = combineReducers<bool>([
 ]);
 
 Reducer<String> selectedIdReducer = combineReducers([
+  TypedReducer<String, ArchiveWebhooksSuccess>((completer, action) => ''),
+  TypedReducer<String, DeleteWebhooksSuccess>((completer, action) => ''),
   TypedReducer<String, PreviewEntity>((selectedId, action) =>
       action.entityType == EntityType.webhook ? action.entityId : selectedId),
   TypedReducer<String, ViewWebhook>(
diff --git a/stubs/redux/stub/stub_reducer b/stubs/redux/stub/stub_reducer
index 1e5642bf3..296f1ec4c 100644
--- a/stubs/redux/stub/stub_reducer
+++ b/stubs/redux/stub/stub_reducer
@@ -41,6 +41,8 @@ final tabIndexReducer = combineReducers<int>([
 ]);
 
 Reducer<String> selectedIdReducer = combineReducers([
+  TypedReducer<String, ArchiveStubsSuccess>((completer, action) => ''),
+  TypedReducer<String, DeleteStubsSuccess>((completer, action) => ''),
   TypedReducer<String, PreviewEntity>((selectedId, action) =>
       action.entityType == EntityType.stub
           ? action.entityId