diff --git a/lib/redux/recurring_expense/recurring_expense_middleware.dart b/lib/redux/recurring_expense/recurring_expense_middleware.dart index f3b74b763..1f8f98b40 100644 --- a/lib/redux/recurring_expense/recurring_expense_middleware.dart +++ b/lib/redux/recurring_expense/recurring_expense_middleware.dart @@ -1,6 +1,8 @@ // Flutter imports: import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; +import 'package:invoiceninja_flutter/redux/transaction/transaction_actions.dart'; +import 'package:invoiceninja_flutter/utils/platforms.dart'; // Package imports: import 'package:redux/redux.dart'; @@ -251,7 +253,11 @@ Middleware _loadRecurringExpenses( if (action.completer != null) { action.completer.complete(null); } - store.dispatch(PersistData()); + if (supportsBankAccounts()) { + store.dispatch(LoadTransactions()); + } else { + store.dispatch(PersistData()); + } }).catchError((Object error) { print(error); store.dispatch(LoadRecurringExpensesFailure(error)); diff --git a/lib/redux/transaction/transaction_middleware.dart b/lib/redux/transaction/transaction_middleware.dart index c7edb109e..2a6370481 100644 --- a/lib/redux/transaction/transaction_middleware.dart +++ b/lib/redux/transaction/transaction_middleware.dart @@ -313,11 +313,7 @@ Middleware _loadTransactions(TransactionRepository repository) { if (action.completer != null) { action.completer.complete(null); } - /* - if (state.productState.isStale) { - store.dispatch(LoadProducts()); - } - */ + store.dispatch(PersistData()); }).catchError((Object error) { print(error); store.dispatch(LoadTransactionsFailure(error)); diff --git a/lib/redux/ui/ui_reducer.dart b/lib/redux/ui/ui_reducer.dart index ada34193b..e42ae8474 100644 --- a/lib/redux/ui/ui_reducer.dart +++ b/lib/redux/ui/ui_reducer.dart @@ -12,6 +12,7 @@ import 'package:invoiceninja_flutter/redux/quote/quote_actions.dart'; import 'package:invoiceninja_flutter/redux/recurring_expense/recurring_expense_actions.dart'; import 'package:invoiceninja_flutter/redux/recurring_invoice/recurring_invoice_actions.dart'; import 'package:invoiceninja_flutter/redux/task/task_actions.dart'; +import 'package:invoiceninja_flutter/redux/transaction/transaction_actions.dart'; import 'package:invoiceninja_flutter/redux/vendor/vendor_actions.dart'; import 'package:redux/redux.dart'; @@ -178,6 +179,9 @@ Reducer loadingEntityTypeReducer = combineReducers([ TypedReducer((state, action) { return EntityType.recurringExpense; }), + TypedReducer((state, action) { + return EntityType.transaction; + }), ]); Reducer filterClearedAtReducer = combineReducers([ diff --git a/stubs/redux/stub/stub_middleware b/stubs/redux/stub/stub_middleware index 0251a2b3f..a42ab1306 100644 --- a/stubs/redux/stub/stub_middleware +++ b/stubs/redux/stub/stub_middleware @@ -228,11 +228,7 @@ Middleware _loadStubs(StubRepository repository) { if (action.completer != null) { action.completer.complete(null); } - /* - if (state.productState.isStale) { - store.dispatch(LoadProducts()); - } - */ + }).catchError((Object error) { print(error); store.dispatch(LoadStubsFailure(error));