diff --git a/lib/redux/auth/auth_middleware.dart b/lib/redux/auth/auth_middleware.dart index 1320c6669..0864a8509 100644 --- a/lib/redux/auth/auth_middleware.dart +++ b/lib/redux/auth/auth_middleware.dart @@ -192,6 +192,7 @@ Middleware _createRefreshRequest(AuthRepository repository) { NextDispatcher next) async { final action = dynamicAction as RefreshData; final state = store.state; + final company = state.company; if (state.isSaving || state.isLoading) { print('Skipping refresh request - pending request'); @@ -210,7 +211,7 @@ Middleware _createRefreshRequest(AuthRepository repository) { TokenEntity.unobscureToken(prefs.getString(kSharedPrefToken)) ?? 'TOKEN'; - final updatedAt = action.clearData + final updatedAt = action.clearData && !company.isLarge ? 0 : ((state.userCompanyState.lastUpdated - kMillisecondsToRefreshData) / 1000) @@ -226,7 +227,7 @@ Middleware _createRefreshRequest(AuthRepository repository) { includeStatic: action.includeStatic || state.staticState.isStale, ) .then((data) { - if (action.clearData) { + if (action.clearData && !company.isLarge) { store.dispatch(ClearData()); } store.dispatch(LoadAccountSuccess( diff --git a/lib/redux/expense/expense_middleware.dart b/lib/redux/expense/expense_middleware.dart index 2b519bcba..947c723fb 100644 --- a/lib/redux/expense/expense_middleware.dart +++ b/lib/redux/expense/expense_middleware.dart @@ -224,7 +224,6 @@ Middleware _loadExpenses(ExpenseRepository repository) { store.dispatch(LoadExpensesRequest()); repository.loadList(store.state.credentials).then((data) { store.dispatch(LoadExpensesSuccess(data)); - if (action.completer != null) { action.completer.complete(null); } diff --git a/windows/flutter/CMakeLists.txt b/windows/flutter/CMakeLists.txt index c7a8c7607..744f08a93 100644 --- a/windows/flutter/CMakeLists.txt +++ b/windows/flutter/CMakeLists.txt @@ -91,6 +91,7 @@ add_custom_command( ${FLUTTER_TOOL_ENVIRONMENT} "${FLUTTER_ROOT}/packages/flutter_tools/bin/tool_backend.bat" windows-x64 $ + VERBATIM ) add_custom_target(flutter_assemble DEPENDS "${FLUTTER_LIBRARY}"