Code refactor

lib/redux/client/client_actions.dart

@@ -78,10 +78,9 @@ class LoadClientActivity {
 }
 
 class LoadClients {
-  LoadClients({this.completer, this.force = false});
+  LoadClients({this.completer});
 
   final Completer completer;
-  final bool force;
 }
 
 class LoadClientRequest implements StartLoading {}

lib/redux/company_gateway/company_gateway_actions.dart

@@ -66,10 +66,9 @@ class LoadCompanyGatewayActivity {
 }
 
 class LoadCompanyGateways {
-  LoadCompanyGateways({this.completer, this.force = false});
+  LoadCompanyGateways({this.completer});
 
   final Completer completer;
-  final bool force;
 }
 
 class LoadCompanyGatewayRequest implements StartLoading {}

lib/redux/credit/credit_actions.dart

@@ -82,10 +82,9 @@ class LoadCredit {
 }
 
 class LoadCredits {
-  LoadCredits({this.completer, this.force = false});
+  LoadCredits({this.completer});
 
   final Completer completer;
-  final bool force;
 }
 
 class LoadCreditRequest implements StartLoading {}

lib/redux/design/design_actions.dart

@@ -67,10 +67,9 @@ class LoadDesignActivity {
 }
 
 class LoadDesigns {
-  LoadDesigns({this.completer, this.force = false});
+  LoadDesigns({this.completer});
 
   final Completer completer;
-  final bool force;
 }
 
 class LoadDesignRequest implements StartLoading {}

lib/redux/document/document_actions.dart

@@ -58,10 +58,9 @@ class LoadDocumentActivity {
 }
 
 class LoadDocuments {
-  LoadDocuments({this.completer, this.force = false});
+  LoadDocuments({this.completer});
 
   final Completer completer;
-  final bool force;
 }
 
 class LoadDocumentRequest implements StartLoading {}

lib/redux/expense/expense_actions.dart

@@ -66,10 +66,9 @@ class LoadExpenseActivity {
 }
 
 class LoadExpenses {
-  LoadExpenses({this.completer, this.force = false});
+  LoadExpenses({this.completer});
 
   final Completer completer;
-  final bool force;
 }
 
 class LoadExpenseRequest implements StartLoading {}

lib/redux/group/group_actions.dart

@@ -67,10 +67,9 @@ class LoadGroupActivity {
 }
 
 class LoadGroups {
-  LoadGroups({this.completer, this.force = false});
+  LoadGroups({this.completer});
 
   final Completer completer;
-  final bool force;
 }
 
 class LoadGroupRequest implements StartLoading {}

lib/redux/invoice/invoice_actions.dart

@@ -80,10 +80,9 @@ class LoadInvoice {
 }
 
 class LoadInvoices {
-  LoadInvoices({this.completer, this.force = false});
+  LoadInvoices({this.completer});
 
   final Completer completer;
-  final bool force;
 }
 
 class LoadInvoiceRequest implements StartLoading {}

lib/redux/invoice/invoice_middleware.dart

@@ -1,14 +1,9 @@
-import 'dart:async';
-
 import 'package:flutter/material.dart';
 import 'package:invoiceninja_flutter/data/models/models.dart';
 import 'package:invoiceninja_flutter/redux/app/app_actions.dart';
 import 'package:invoiceninja_flutter/redux/app/app_middleware.dart';
-import 'package:invoiceninja_flutter/redux/expense/expense_actions.dart';
 import 'package:invoiceninja_flutter/redux/invoice/invoice_actions.dart';
 import 'package:invoiceninja_flutter/redux/payment/payment_actions.dart';
-import 'package:invoiceninja_flutter/redux/product/product_actions.dart';
-import 'package:invoiceninja_flutter/redux/task/task_actions.dart';
 import 'package:invoiceninja_flutter/redux/ui/ui_actions.dart';
 import 'package:invoiceninja_flutter/ui/invoice/invoice_email_vm.dart';
 import 'package:invoiceninja_flutter/ui/invoice/edit/invoice_edit_vm.dart';
@@ -303,12 +298,7 @@ Middleware<AppState> _markInvoicePaid(InvoiceRepository repository) {
             store.state.credentials, action.invoiceIds, EntityAction.markPaid)
         .then((invoices) {
       store.dispatch(MarkInvoicesPaidSuccess(invoices));
-      final Completer<Null> completer = Completer<Null>();
+      store.dispatch(RefreshData());
-      completer.future.then((_) {
-        store.dispatch(LoadPayments(force: true));
-      });
-      store.dispatch(
-          LoadClient(clientId: invoices.first.clientId, completer: completer));
       if (action.completer != null) {
         action.completer.complete(null);
       }
@@ -366,14 +356,7 @@ Middleware<AppState> _saveInvoice(InvoiceRepository repository) {
       } else {
         store.dispatch(SaveInvoiceSuccess(invoice));
       }
-      if (invoice.hasTasks) {
+      store.dispatch(RefreshData());
-        store.dispatch(LoadTasks(force: true));
-      } else if (invoice.hasExpenses) {
-        store.dispatch(LoadExpenses(force: true));
-      } else {
-        // TODO add check if auto-update is enabled
-        store.dispatch(LoadProducts(force: true));
-      }
       action.completer.complete(invoice);
     }).catchError((Object error) {
       print(error);

lib/redux/payment/payment_actions.dart

@@ -79,10 +79,9 @@ class LoadPaymentActivity {
 }
 
 class LoadPayments {
-  LoadPayments({this.completer, this.force = false});
+  LoadPayments({this.completer});
 
   final Completer completer;
-  final bool force;
 }
 
 class LoadPaymentRequest implements StartLoading {}

lib/redux/payment/payment_middleware.dart

@@ -2,7 +2,6 @@ import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
 import 'package:invoiceninja_flutter/redux/app/app_actions.dart';
 import 'package:invoiceninja_flutter/redux/app/app_middleware.dart';
-import 'package:invoiceninja_flutter/redux/invoice/invoice_actions.dart';
 import 'package:invoiceninja_flutter/redux/quote/quote_actions.dart';
 import 'package:invoiceninja_flutter/ui/payment/refund/payment_refund_vm.dart';
 import 'package:invoiceninja_flutter/utils/platforms.dart';
@@ -171,7 +170,7 @@ Middleware<AppState> _deletePayment(PaymentRepository repository) {
             store.state.credentials, action.paymentIds, EntityAction.delete)
         .then((List<PaymentEntity> payments) {
       store.dispatch(DeletePaymentsSuccess(payments));
-      store.dispatch(LoadInvoices(force: true));
+      store.dispatch(RefreshData());
       if (action.completer != null) {
         action.completer.complete(null);
       }
@@ -198,7 +197,7 @@ Middleware<AppState> _restorePayment(PaymentRepository repository) {
             store.state.credentials, action.paymentIds, EntityAction.restore)
         .then((List<PaymentEntity> payments) {
       store.dispatch(RestorePaymentsSuccess(payments));
-      store.dispatch(LoadInvoices(force: true));
+      store.dispatch(RefreshData());
       if (action.completer != null) {
         action.completer.complete(null);
       }
@@ -228,7 +227,7 @@ Middleware<AppState> _savePayment(PaymentRepository repository) {
       } else {
         store.dispatch(SavePaymentSuccess(payment));
       }
-      store.dispatch(LoadInvoices(force: true));
+      store.dispatch(RefreshData());
       action.completer.complete(payment);
     }).catchError((Object error) {
       print(error);
@@ -251,7 +250,7 @@ Middleware<AppState> _refundPayment(PaymentRepository repository) {
         .then((PaymentEntity payment) {
       store.dispatch(SavePaymentSuccess(payment));
       store.dispatch(RefundPaymentSuccess(payment));
-      store.dispatch(LoadInvoices(force: true));
+      store.dispatch(RefreshData());
       action.completer.complete(payment);
     }).catchError((Object error) {
       print(error);

lib/redux/payment_term/payment_term_actions.dart

@@ -68,10 +68,9 @@ class LoadPaymentTermActivity {
 }
 
 class LoadPaymentTerms {
-  LoadPaymentTerms({this.completer, this.force = false});
+  LoadPaymentTerms({this.completer});
 
   final Completer completer;
-  final bool force;
 }
 
 class LoadPaymentTermRequest implements StartLoading {}

lib/redux/product/product_actions.dart

@@ -51,10 +51,9 @@ class UpdateProduct implements PersistUI {
 }
 
 class LoadProducts {
-  LoadProducts({this.completer, this.force = false});
+  LoadProducts({this.completer});
 
   final Completer completer;
-  final bool force;
 }
 
 class LoadProductsRequest implements StartLoading {}

lib/redux/project/project_actions.dart

@@ -68,10 +68,9 @@ class LoadProjectActivity {
 }
 
 class LoadProjects {
-  LoadProjects({this.completer, this.force = false});
+  LoadProjects({this.completer});
 
   final Completer completer;
-  final bool force;
 }
 
 class LoadProjectRequest implements StartLoading {}

lib/redux/quote/quote_actions.dart

@@ -82,10 +82,9 @@ class LoadQuote {
 }
 
 class LoadQuotes {
-  LoadQuotes({this.completer, this.force = false});
+  LoadQuotes({this.completer});
 
   final Completer completer;
-  final bool force;
 }
 
 class LoadQuoteRequest implements StartLoading {}

lib/redux/quote/quote_middleware.dart

@@ -3,7 +3,6 @@ import 'package:invoiceninja_flutter/data/models/models.dart';
 import 'package:invoiceninja_flutter/redux/app/app_actions.dart';
 import 'package:invoiceninja_flutter/redux/app/app_middleware.dart';
 import 'package:invoiceninja_flutter/redux/credit/credit_actions.dart';
-import 'package:invoiceninja_flutter/redux/invoice/invoice_actions.dart';
 import 'package:invoiceninja_flutter/redux/quote/quote_actions.dart';
 import 'package:invoiceninja_flutter/redux/ui/ui_actions.dart';
 import 'package:invoiceninja_flutter/ui/quote/edit/quote_edit_vm.dart';
@@ -219,7 +218,7 @@ Middleware<AppState> _convertQuote(QuoteRepository repository) {
             store.state.credentials, action.quoteIds, EntityAction.convert)
         .then((quotes) {
       store.dispatch(ConvertQuoteSuccess(quotes: quotes));
-      store.dispatch(LoadInvoices(force: true));
+      store.dispatch(RefreshData());
       action.completer.complete(null);
     }).catchError((Object error) {
       print(error);

lib/redux/task/task_actions.dart

@@ -72,10 +72,9 @@ class LoadTaskActivity {
 }
 
 class LoadTasks {
-  LoadTasks({this.completer, this.force = false});
+  LoadTasks({this.completer});
 
   final Completer completer;
-  final bool force;
 }
 
 class LoadTaskRequest implements StartLoading {}

lib/redux/tax_rate/tax_rate_actions.dart

@@ -62,10 +62,9 @@ class LoadTaxRateActivity {
 }
 
 class LoadTaxRates {
-  LoadTaxRates({this.completer, this.force = false});
+  LoadTaxRates({this.completer});
 
   final Completer completer;
-  final bool force;
 }
 
 class LoadTaxRateRequest implements StartLoading {}

lib/redux/token/token_actions.dart

@@ -67,10 +67,9 @@ class LoadTokenActivity {
 }
 
 class LoadTokens {
-  LoadTokens({this.completer, this.force = false});
+  LoadTokens({this.completer});
 
   final Completer completer;
-  final bool force;
 }
 
 class LoadTokenRequest implements StartLoading {}

lib/redux/user/user_actions.dart

@@ -72,10 +72,9 @@ class LoadUserActivity {
 }
 
 class LoadUsers {
-  LoadUsers({this.completer, this.force = false});
+  LoadUsers({this.completer});
 
   final Completer completer;
-  final bool force;
 }
 
 class LoadUserRequest implements StartLoading {}

lib/redux/vendor/vendor_actions.dart

@@ -68,10 +68,9 @@ class LoadVendorActivity {
 }
 
 class LoadVendors {
-  LoadVendors({this.completer, this.force = false});
+  LoadVendors({this.completer});
 
   final Completer completer;
-  final bool force;
 }
 
 class LoadVendorRequest implements StartLoading {}

lib/redux/webhook/webhook_actions.dart

@@ -67,10 +67,9 @@ class LoadWebhookActivity {
 }
 
 class LoadWebhooks {
-  LoadWebhooks({this.completer, this.force = false});
+  LoadWebhooks({this.completer});
 
   final Completer completer;
-  final bool force;
 }
 
 class LoadWebhookRequest implements StartLoading {}

stubs/redux/stub/stub_actions

@@ -66,10 +66,9 @@ class LoadStubActivity {
 }
 
 class LoadStubs {
-  LoadStubs({this.completer, this.force = false});
+  LoadStubs({this.completer});
 
   final Completer completer;
-  final bool force;
 }
 
 class LoadStubRequest implements StartLoading {}