diff --git a/lib/data/models/expense_model.dart b/lib/data/models/expense_model.dart
index 5bb422a7c..6dca36278 100644
--- a/lib/data/models/expense_model.dart
+++ b/lib/data/models/expense_model.dart
@@ -68,10 +68,7 @@ abstract class ExpenseEntity extends Object
     with BaseEntity, SelectableEntity, BelongsToClient
     implements Built<ExpenseEntity, ExpenseEntityBuilder> {
   factory ExpenseEntity(
-      {String id,
-      AppState state,
-      VendorEntity vendor,
-      ClientEntity client}) {
+      {String id, AppState state, VendorEntity vendor, ClientEntity client}) {
     return _$ExpenseEntity._(
       id: id ?? BaseEntity.nextId,
       isChanged: false,
diff --git a/lib/data/models/invoice_model.dart b/lib/data/models/invoice_model.dart
index 2b80cdfa0..f6b343640 100644
--- a/lib/data/models/invoice_model.dart
+++ b/lib/data/models/invoice_model.dart
@@ -69,10 +69,7 @@ abstract class InvoiceEntity extends Object
     with BaseEntity, SelectableEntity, CalculateInvoiceTotal
     implements Built<InvoiceEntity, InvoiceEntityBuilder> {
   factory InvoiceEntity(
-      {String id,
-      bool isQuote = false,
-      AppState state,
-      ClientEntity client}) {
+      {String id, bool isQuote = false, AppState state, ClientEntity client}) {
     final company = state?.company;
     return _$InvoiceEntity._(
       id: id ?? BaseEntity.nextId,
diff --git a/lib/data/repositories/persistence_repository.dart b/lib/data/repositories/persistence_repository.dart
index f2dcb0601..183d1644a 100644
--- a/lib/data/repositories/persistence_repository.dart
+++ b/lib/data/repositories/persistence_repository.dart
@@ -54,7 +54,8 @@ class PersistenceRepository {
   Future<AuthState> loadAuthState() async {
     if (await fileStorage.exists()) {
       final String data = await fileStorage.load();
-      return serializers.deserializeWith(AuthState.serializer, json.decode(data));
+      return serializers.deserializeWith(
+          AuthState.serializer, json.decode(data));
     } else {
       throw 'State does not exist on file';
     }
diff --git a/lib/data/repositories/user_repository.dart b/lib/data/repositories/user_repository.dart
index d25982b30..5b11f48e3 100644
--- a/lib/data/repositories/user_repository.dart
+++ b/lib/data/repositories/user_repository.dart
@@ -17,7 +17,8 @@ class UserRepository {
 
   Future<UserEntity> loadItem(Credentials credentials, String entityId) async {
     final dynamic response = await webClient.get(
-        '${credentials.url}/users/$entityId?include=company_user', credentials.token);
+        '${credentials.url}/users/$entityId?include=company_user',
+        credentials.token);
 
     final UserItemResponse userResponse =
         serializers.deserializeWith(UserItemResponse.serializer, response);
diff --git a/lib/redux/auth/auth_state.dart b/lib/redux/auth/auth_state.dart
index 4352fae46..0b5241722 100644
--- a/lib/redux/auth/auth_state.dart
+++ b/lib/redux/auth/auth_state.dart
@@ -37,4 +37,3 @@ abstract class AuthState implements Built<AuthState, AuthStateBuilder> {
 
   static Serializer<AuthState> get serializer => _$authStateSerializer;
 }
-
diff --git a/lib/redux/client/client_actions.dart b/lib/redux/client/client_actions.dart
index c51af94dd..830becf2e 100644
--- a/lib/redux/client/client_actions.dart
+++ b/lib/redux/client/client_actions.dart
@@ -377,11 +377,9 @@ void handleClientAction(
 
       for (final client in clients) {
         if (!state.clientListState.isSelected(client.id)) {
-          store.dispatch(
-              AddToClientMultiselect(entity: client));
+          store.dispatch(AddToClientMultiselect(entity: client));
         } else {
-          store.dispatch(
-              RemoveFromClientMultiselect(entity: client));
+          store.dispatch(RemoveFromClientMultiselect(entity: client));
         }
       }
       break;
diff --git a/lib/redux/client/client_middleware.dart b/lib/redux/client/client_middleware.dart
index c23a23174..7c8443302 100644
--- a/lib/redux/client/client_middleware.dart
+++ b/lib/redux/client/client_middleware.dart
@@ -40,8 +40,7 @@ List<Middleware<AppState>> createStoreClientsMiddleware([
 }
 
 Middleware<AppState> _editClient() {
-  return (Store<AppState> store, dynamic dynamicAction,
-      NextDispatcher next) {
+  return (Store<AppState> store, dynamic dynamicAction, NextDispatcher next) {
     final action = dynamicAction as EditClient;
 
     if (!action.force &&
diff --git a/lib/redux/company/company_actions.dart b/lib/redux/company/company_actions.dart
index dfc151215..73961fb22 100644
--- a/lib/redux/company/company_actions.dart
+++ b/lib/redux/company/company_actions.dart
@@ -42,4 +42,3 @@ class SaveCompanyFailure implements StopSaving {
 
   final Object error;
 }
-
diff --git a/lib/redux/company/company_reducer.dart b/lib/redux/company/company_reducer.dart
index 16b8a8da8..9b004f943 100644
--- a/lib/redux/company/company_reducer.dart
+++ b/lib/redux/company/company_reducer.dart
@@ -56,8 +56,9 @@ Reducer<UserCompanyEntity> userCompanyEntityReducer = combineReducers([
       loadCompanySuccessReducer),
   TypedReducer<UserCompanyEntity, SaveCompanySuccess>(
       saveCompanySuccessReducer),
-  TypedReducer<UserCompanyEntity, SaveUserSettingsSuccess>((userCompany, action) =>
-      userCompany.rebuild((b) => b..user.replace(action.user))),
+  TypedReducer<UserCompanyEntity, SaveUserSettingsSuccess>(
+      (userCompany, action) =>
+          userCompany.rebuild((b) => b..user.replace(action.user))),
 ]);
 
 UserCompanyEntity loadCompanySuccessReducer(
diff --git a/lib/redux/company_gateway/company_gateway_middleware.dart b/lib/redux/company_gateway/company_gateway_middleware.dart
index 77ab1e9bc..99dd1f0bf 100644
--- a/lib/redux/company_gateway/company_gateway_middleware.dart
+++ b/lib/redux/company_gateway/company_gateway_middleware.dart
@@ -43,8 +43,7 @@ List<Middleware<AppState>> createStoreCompanyGatewaysMiddleware([
 }
 
 Middleware<AppState> _editCompanyGateway() {
-  return (Store<AppState> store, dynamic dynamicAction,
-      NextDispatcher next) {
+  return (Store<AppState> store, dynamic dynamicAction, NextDispatcher next) {
     final action = dynamicAction as EditCompanyGateway;
 
     if (!action.force &&
diff --git a/lib/redux/document/document_middleware.dart b/lib/redux/document/document_middleware.dart
index b65ccf96b..a10abc48e 100644
--- a/lib/redux/document/document_middleware.dart
+++ b/lib/redux/document/document_middleware.dart
@@ -39,8 +39,7 @@ List<Middleware<AppState>> createStoreDocumentsMiddleware([
 }
 
 Middleware<AppState> _editDocument() {
-  return (Store<AppState> store, dynamic dynamicAction,
-      NextDispatcher next) {
+  return (Store<AppState> store, dynamic dynamicAction, NextDispatcher next) {
     final action = dynamicAction as EditDocument;
 
     next(action);
diff --git a/lib/redux/expense/expense_middleware.dart b/lib/redux/expense/expense_middleware.dart
index 5e146ad07..4cfc261f2 100644
--- a/lib/redux/expense/expense_middleware.dart
+++ b/lib/redux/expense/expense_middleware.dart
@@ -41,8 +41,7 @@ List<Middleware<AppState>> createStoreExpensesMiddleware([
 }
 
 Middleware<AppState> _editExpense() {
-  return (Store<AppState> store, dynamic dynamicAction,
-      NextDispatcher next) {
+  return (Store<AppState> store, dynamic dynamicAction, NextDispatcher next) {
     final action = dynamicAction as EditExpense;
 
     if (!action.force &&
diff --git a/lib/redux/group/group_middleware.dart b/lib/redux/group/group_middleware.dart
index e1c04a651..9368ee1df 100644
--- a/lib/redux/group/group_middleware.dart
+++ b/lib/redux/group/group_middleware.dart
@@ -40,8 +40,7 @@ List<Middleware<AppState>> createStoreGroupsMiddleware([
 }
 
 Middleware<AppState> _editGroup() {
-  return (Store<AppState> store, dynamic dynamicAction,
-      NextDispatcher next) {
+  return (Store<AppState> store, dynamic dynamicAction, NextDispatcher next) {
     final action = dynamicAction as EditGroup;
 
     if (!action.force &&
diff --git a/lib/redux/invoice/invoice_middleware.dart b/lib/redux/invoice/invoice_middleware.dart
index 0aa7b214c..8b0f539df 100644
--- a/lib/redux/invoice/invoice_middleware.dart
+++ b/lib/redux/invoice/invoice_middleware.dart
@@ -94,8 +94,7 @@ Middleware<AppState> _viewInvoice() {
 }
 
 Middleware<AppState> _editInvoice() {
-  return (Store<AppState> store, dynamic dynamicAction,
-      NextDispatcher next) {
+  return (Store<AppState> store, dynamic dynamicAction, NextDispatcher next) {
     final action = dynamicAction as EditInvoice;
 
     if (!action.force &&
diff --git a/lib/redux/payment/payment_actions.dart b/lib/redux/payment/payment_actions.dart
index d480fa914..b6280cfdf 100644
--- a/lib/redux/payment/payment_actions.dart
+++ b/lib/redux/payment/payment_actions.dart
@@ -308,11 +308,9 @@ void handlePaymentAction(
 
       for (final payment in payments) {
         if (!store.state.paymentListState.isSelected(payment.id)) {
-          store.dispatch(
-              AddToPaymentMultiselect(entity: payment));
+          store.dispatch(AddToPaymentMultiselect(entity: payment));
         } else {
-          store.dispatch(
-              RemoveFromPaymentMultiselect(entity: payment));
+          store.dispatch(RemoveFromPaymentMultiselect(entity: payment));
         }
       }
       break;
diff --git a/lib/redux/payment/payment_middleware.dart b/lib/redux/payment/payment_middleware.dart
index 5d7c357e3..dfd9295e2 100644
--- a/lib/redux/payment/payment_middleware.dart
+++ b/lib/redux/payment/payment_middleware.dart
@@ -43,8 +43,7 @@ List<Middleware<AppState>> createStorePaymentsMiddleware([
 }
 
 Middleware<AppState> _editPayment() {
-  return (Store<AppState> store, dynamic dynamicAction,
-      NextDispatcher next) {
+  return (Store<AppState> store, dynamic dynamicAction, NextDispatcher next) {
     final action = dynamicAction as EditPayment;
 
     if (!action.force &&
diff --git a/lib/redux/product/product_middleware.dart b/lib/redux/product/product_middleware.dart
index 0fd069ed3..6e2149710 100644
--- a/lib/redux/product/product_middleware.dart
+++ b/lib/redux/product/product_middleware.dart
@@ -37,8 +37,7 @@ List<Middleware<AppState>> createStoreProductsMiddleware([
 }
 
 Middleware<AppState> _editProduct() {
-  return (Store<AppState> store, dynamic dynamicAction,
-      NextDispatcher next) {
+  return (Store<AppState> store, dynamic dynamicAction, NextDispatcher next) {
     final action = dynamicAction as EditProduct;
 
     if (!action.force &&
diff --git a/lib/redux/project/project_middleware.dart b/lib/redux/project/project_middleware.dart
index 28ce9b043..5e6e7dc4e 100644
--- a/lib/redux/project/project_middleware.dart
+++ b/lib/redux/project/project_middleware.dart
@@ -41,8 +41,7 @@ List<Middleware<AppState>> createStoreProjectsMiddleware([
 }
 
 Middleware<AppState> _editProject() {
-  return (Store<AppState> store, dynamic dynamicAction,
-      NextDispatcher next) {
+  return (Store<AppState> store, dynamic dynamicAction, NextDispatcher next) {
     final action = dynamicAction as EditProject;
 
     if (!action.force &&
diff --git a/lib/redux/quote/quote_middleware.dart b/lib/redux/quote/quote_middleware.dart
index 2e1213b79..5261a742d 100644
--- a/lib/redux/quote/quote_middleware.dart
+++ b/lib/redux/quote/quote_middleware.dart
@@ -94,8 +94,7 @@ Middleware<AppState> _viewQuoteList() {
 }
 
 Middleware<AppState> _editQuote() {
-  return (Store<AppState> store, dynamic dynamicAction,
-      NextDispatcher next) {
+  return (Store<AppState> store, dynamic dynamicAction, NextDispatcher next) {
     final action = dynamicAction as EditQuote;
 
     if (!action.force &&
diff --git a/lib/redux/task/task_middleware.dart b/lib/redux/task/task_middleware.dart
index 4f6e20b8e..fe9c68c15 100644
--- a/lib/redux/task/task_middleware.dart
+++ b/lib/redux/task/task_middleware.dart
@@ -40,8 +40,7 @@ List<Middleware<AppState>> createStoreTasksMiddleware([
 }
 
 Middleware<AppState> _editTask() {
-  return (Store<AppState> store, dynamic dynamicAction,
-      NextDispatcher next) {
+  return (Store<AppState> store, dynamic dynamicAction, NextDispatcher next) {
     final action = dynamicAction as EditTask;
 
     if (!action.force &&
diff --git a/lib/redux/tax_rate/tax_rate_middleware.dart b/lib/redux/tax_rate/tax_rate_middleware.dart
index 4ff424d96..f2300ebeb 100644
--- a/lib/redux/tax_rate/tax_rate_middleware.dart
+++ b/lib/redux/tax_rate/tax_rate_middleware.dart
@@ -39,8 +39,7 @@ List<Middleware<AppState>> createStoreTaxRatesMiddleware([
 }
 
 Middleware<AppState> _editTaxRate() {
-  return (Store<AppState> store, dynamic dynamicAction,
-      NextDispatcher next) {
+  return (Store<AppState> store, dynamic dynamicAction, NextDispatcher next) {
     final action = dynamicAction as EditTaxRate;
 
     if (!action.force &&
diff --git a/lib/redux/ui/pref_reducer.dart b/lib/redux/ui/pref_reducer.dart
index be4b92763..d9cd155a7 100644
--- a/lib/redux/ui/pref_reducer.dart
+++ b/lib/redux/ui/pref_reducer.dart
@@ -15,7 +15,8 @@ import 'package:invoiceninja_flutter/redux/product/product_actions.dart';
 import 'package:invoiceninja_flutter/redux/project/project_actions.dart';
 import 'package:invoiceninja_flutter/redux/quote/quote_actions.dart';
 import 'package:invoiceninja_flutter/redux/settings/settings_actions.dart';
-import 'package:invoiceninja_flutter/redux/settings/settings_actions.dart' as prefix0;
+import 'package:invoiceninja_flutter/redux/settings/settings_actions.dart'
+    as prefix0;
 import 'package:invoiceninja_flutter/redux/task/task_actions.dart';
 import 'package:invoiceninja_flutter/redux/ui/pref_state.dart';
 import 'package:invoiceninja_flutter/redux/ui/ui_actions.dart';
@@ -242,7 +243,8 @@ Reducer<SettingsUIState> settingsUIReducer = combineReducers([
       ..origClient.replace(action.client)
       ..isChanged = false);
   }),
-  TypedReducer<SettingsUIState, prefix0.SaveUserSettingsSuccess>((state, action) {
+  TypedReducer<SettingsUIState, prefix0.SaveUserSettingsSuccess>(
+      (state, action) {
     return state.rebuild((b) => b
       ..user.replace(action.user)
       ..origUser.replace(action.user)
diff --git a/lib/redux/ui/pref_state.dart b/lib/redux/ui/pref_state.dart
index 9fbda1b6b..756aefc74 100644
--- a/lib/redux/ui/pref_state.dart
+++ b/lib/redux/ui/pref_state.dart
@@ -65,7 +65,8 @@ abstract class PrefState implements Built<PrefState, PrefStateBuilder> {
       appLayout == AppLayout.mobile || menuSidebarMode == AppSidebarMode.float;
 
   bool get isHistoryFloated =>
-      appLayout == AppLayout.mobile || historySidebarMode == AppSidebarMode.float;
+      appLayout == AppLayout.mobile ||
+      historySidebarMode == AppSidebarMode.float;
 
   bool get showMenu =>
       (isMenuVisible && menuSidebarMode == AppSidebarMode.visible) ||
diff --git a/lib/redux/user/user_middleware.dart b/lib/redux/user/user_middleware.dart
index a7e473782..a52b210d7 100644
--- a/lib/redux/user/user_middleware.dart
+++ b/lib/redux/user/user_middleware.dart
@@ -39,8 +39,7 @@ List<Middleware<AppState>> createStoreUsersMiddleware([
 }
 
 Middleware<AppState> _editUser() {
-  return (Store<AppState> store, dynamic dynamicAction,
-      NextDispatcher next) {
+  return (Store<AppState> store, dynamic dynamicAction, NextDispatcher next) {
     final action = dynamicAction as EditUser;
 
     if (!action.force &&
diff --git a/lib/redux/vendor/vendor_middleware.dart b/lib/redux/vendor/vendor_middleware.dart
index a92f5b670..ec3321588 100644
--- a/lib/redux/vendor/vendor_middleware.dart
+++ b/lib/redux/vendor/vendor_middleware.dart
@@ -41,8 +41,7 @@ List<Middleware<AppState>> createStoreVendorsMiddleware([
 }
 
 Middleware<AppState> _editVendor() {
-  return (Store<AppState> store, dynamic dynamicAction,
-      NextDispatcher next) {
+  return (Store<AppState> store, dynamic dynamicAction, NextDispatcher next) {
     final action = dynamicAction as EditVendor;
 
     if (!action.force &&
diff --git a/lib/ui/app/entities/entity_actions_dialog.dart b/lib/ui/app/entities/entity_actions_dialog.dart
index 309aea68e..5528b2564 100644
--- a/lib/ui/app/entities/entity_actions_dialog.dart
+++ b/lib/ui/app/entities/entity_actions_dialog.dart
@@ -67,7 +67,7 @@ class EntityActionListTile extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final localization = AppLocalization.of(context);
-    
+
     return ListTile(
       leading: Icon(getEntityActionIcon(action)),
       title: Text(localization.lookup(action.toString())),
diff --git a/lib/ui/app/entity_dropdown.dart b/lib/ui/app/entity_dropdown.dart
index 4359e77dd..c9de82398 100644
--- a/lib/ui/app/entity_dropdown.dart
+++ b/lib/ui/app/entity_dropdown.dart
@@ -151,9 +151,7 @@ class EntityDropdownDialog extends StatefulWidget {
 
   final BuiltMap<String, SelectableEntity> entityMap;
   final List<String> entityList;
-  final Function(SelectableEntity, [bool]) onSelected
-
-  ;
+  final Function(SelectableEntity, [bool]) onSelected;
   final Function(BuildContext context, Completer completer) onAddPressed;
 
   @override
diff --git a/lib/ui/auth/lock_screen.dart b/lib/ui/auth/lock_screen.dart
index c9a12ef30..91510f339 100644
--- a/lib/ui/auth/lock_screen.dart
+++ b/lib/ui/auth/lock_screen.dart
@@ -1,4 +1,3 @@
-
 import 'package:flutter/material.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:invoiceninja_flutter/utils/localization.dart';
diff --git a/lib/ui/client/client_screen.dart b/lib/ui/client/client_screen.dart
index 3c90b11ea..c7b318c48 100644
--- a/lib/ui/client/client_screen.dart
+++ b/lib/ui/client/client_screen.dart
@@ -38,8 +38,7 @@ class ClientScreen extends StatelessWidget {
       isChecked: isInMultiselect &&
           listUIState.selectedIds.length == viewModel.clientList.length,
       showCheckbox: isInMultiselect,
-      onHamburgerLongPress: () =>
-          store.dispatch(StartClientMultiselect()),
+      onHamburgerLongPress: () => store.dispatch(StartClientMultiselect()),
       onCheckboxChanged: (value) {
         final clients = viewModel.clientList
             .map<ClientEntity>((clientId) => viewModel.clientMap[clientId])
@@ -71,8 +70,7 @@ class ClientScreen extends StatelessWidget {
               localization.cancel,
               style: TextStyle(color: Colors.white),
             ),
-            onPressed: () =>
-                store.dispatch(ClearClientMultiselect()),
+            onPressed: () => store.dispatch(ClearClientMultiselect()),
           ),
         if (viewModel.isInMultiselect)
           FlatButton(
diff --git a/lib/ui/client/view/client_view_overview.dart b/lib/ui/client/view/client_view_overview.dart
index 5386fa726..b0b7fa675 100644
--- a/lib/ui/client/view/client_view_overview.dart
+++ b/lib/ui/client/view/client_view_overview.dart
@@ -64,7 +64,8 @@ class ClientOverview extends StatelessWidget {
           label: localization.paidToDate,
           value: formatNumber(client.paidToDate, context, clientId: client.id),
           secondLabel: localization.balanceDue,
-          secondValue: formatNumber(client.balance, context, clientId: client.id),
+          secondValue:
+              formatNumber(client.balance, context, clientId: client.id),
         ),
         client.privateNotes != null && client.privateNotes.isNotEmpty
             ? IconMessage(client.privateNotes)
diff --git a/lib/ui/company_gateway/company_gateway_screen.dart b/lib/ui/company_gateway/company_gateway_screen.dart
index 41387e8cc..98046f5dd 100644
--- a/lib/ui/company_gateway/company_gateway_screen.dart
+++ b/lib/ui/company_gateway/company_gateway_screen.dart
@@ -69,11 +69,10 @@ class CompanyGatewayScreen extends StatelessWidget {
                         context: context,
                         multiselect: true);
 
-                    store.dispatch(
-                        ClearCompanyGatewayMultiselect());
+                    store.dispatch(ClearCompanyGatewayMultiselect());
                   },
-            onCancelPressed: (context) => store
-                .dispatch(ClearCompanyGatewayMultiselect()),
+            onCancelPressed: (context) =>
+                store.dispatch(ClearCompanyGatewayMultiselect()),
           )
         else
           SaveCancelButtons(
diff --git a/lib/ui/company_gateway/company_gateway_screen_vm.dart b/lib/ui/company_gateway/company_gateway_screen_vm.dart
index 99fdc3c46..f2f32c998 100644
--- a/lib/ui/company_gateway/company_gateway_screen_vm.dart
+++ b/lib/ui/company_gateway/company_gateway_screen_vm.dart
@@ -69,8 +69,7 @@ class CompanyGatewayScreenVM {
             final completer = snackBarCompleter<Null>(
                 context, AppLocalization.of(context).savedSettings);
             store.dispatch(SaveCompanyRequest(
-                completer: completer,
-                company: settingsUIState.company));
+                completer: completer, company: settingsUIState.company));
             break;
           case EntityType.group:
             final completer = snackBarCompleter<GroupEntity>(
diff --git a/lib/ui/expense/view/expense_view_overview.dart b/lib/ui/expense/view/expense_view_overview.dart
index 1e381723b..f3d76ca4f 100644
--- a/lib/ui/expense/view/expense_view_overview.dart
+++ b/lib/ui/expense/view/expense_view_overview.dart
@@ -52,7 +52,8 @@ class ExpenseOverview extends StatelessWidget {
                 value: formatNumber(expense.amountWithTax, context,
                     currencyId: expense.expenseCurrencyId),
                 secondLabel: localization.converted,
-                secondValue: formatNumber(expense.convertedAmountWithTax, context,
+                secondValue: formatNumber(
+                    expense.convertedAmountWithTax, context,
                     currencyId: expense.invoiceCurrencyId),
               )
             : EntityHeader(
diff --git a/lib/ui/invoice/invoice_screen.dart b/lib/ui/invoice/invoice_screen.dart
index b80b74749..15c738830 100644
--- a/lib/ui/invoice/invoice_screen.dart
+++ b/lib/ui/invoice/invoice_screen.dart
@@ -39,8 +39,7 @@ class InvoiceScreen extends StatelessWidget {
       isChecked: isInMultiselect &&
           listUIState.selectedIds.length == viewModel.invoiceList.length,
       showCheckbox: isInMultiselect,
-      onHamburgerLongPress: () =>
-          store.dispatch(StartInvoiceMultiselect()),
+      onHamburgerLongPress: () => store.dispatch(StartInvoiceMultiselect()),
       onCheckboxChanged: (value) {
         final invoices = viewModel.invoiceList
             .map<InvoiceEntity>((invoiceId) => viewModel.invoiceMap[invoiceId])
diff --git a/lib/ui/payment/payment_screen.dart b/lib/ui/payment/payment_screen.dart
index c3c3da2e6..ea520b0fb 100644
--- a/lib/ui/payment/payment_screen.dart
+++ b/lib/ui/payment/payment_screen.dart
@@ -34,8 +34,7 @@ class PaymentScreen extends StatelessWidget {
       isChecked: isInMultiselect &&
           listUIState.selectedIds.length == viewModel.paymentList.length,
       showCheckbox: isInMultiselect,
-      onHamburgerLongPress: () =>
-          store.dispatch(StartPaymentMultiselect()),
+      onHamburgerLongPress: () => store.dispatch(StartPaymentMultiselect()),
       onCheckboxChanged: (value) {
         final payments = viewModel.paymentList
             .map<PaymentEntity>((paymentId) => viewModel.paymentMap[paymentId])
diff --git a/lib/ui/product/product_screen.dart b/lib/ui/product/product_screen.dart
index 860100641..4247da9b9 100644
--- a/lib/ui/product/product_screen.dart
+++ b/lib/ui/product/product_screen.dart
@@ -37,8 +37,7 @@ class ProductScreen extends StatelessWidget {
       isChecked: isInMultiselect &&
           listUIState.selectedIds.length == viewModel.productList.length,
       showCheckbox: isInMultiselect,
-      onHamburgerLongPress: () =>
-          store.dispatch(StartProductMultiselect()),
+      onHamburgerLongPress: () => store.dispatch(StartProductMultiselect()),
       onCheckboxChanged: (value) {
         final products = viewModel.productList
             .map<ProductEntity>((productId) => viewModel.productMap[productId])
diff --git a/lib/ui/project/project_screen.dart b/lib/ui/project/project_screen.dart
index 0ccfe3f7b..ce7c62043 100644
--- a/lib/ui/project/project_screen.dart
+++ b/lib/ui/project/project_screen.dart
@@ -37,8 +37,7 @@ class ProjectScreen extends StatelessWidget {
       isChecked: isInMultiselect &&
           listUIState.selectedIds.length == viewModel.projectList.length,
       showCheckbox: isInMultiselect,
-      onHamburgerLongPress: () =>
-          store.dispatch(StartProjectMultiselect()),
+      onHamburgerLongPress: () => store.dispatch(StartProjectMultiselect()),
       onCheckboxChanged: (value) {
         final projects = viewModel.projectList
             .map<ProjectEntity>((projectId) => viewModel.projectMap[projectId])
diff --git a/lib/ui/project/view/project_view_vm.dart b/lib/ui/project/view/project_view_vm.dart
index 55caf13c2..473239adb 100644
--- a/lib/ui/project/view/project_view_vm.dart
+++ b/lib/ui/project/view/project_view_vm.dart
@@ -95,10 +95,9 @@ class ProjectViewVM {
         if (longPress && project.isActive && client.isActive) {
           createEntity(
               context: context,
-              entity: TaskEntity(state: state)
-                  .rebuild((b) => b
-                    ..projectId = project.id
-                    ..clientId = project.clientId));
+              entity: TaskEntity(state: state).rebuild((b) => b
+                ..projectId = project.id
+                ..clientId = project.clientId));
         } else {
           viewEntitiesByType(
               context: context,
@@ -109,10 +108,9 @@ class ProjectViewVM {
       onAddTaskPressed: (context) {
         createEntity(
             context: context,
-            entity: TaskEntity(state: state)
-                .rebuild((b) => b
-                  ..projectId = project.id
-                  ..clientId = project.clientId),
+            entity: TaskEntity(state: state).rebuild((b) => b
+              ..projectId = project.id
+              ..clientId = project.clientId),
             force: true);
       },
       onBackPressed: () {
diff --git a/lib/ui/quote/quote_screen.dart b/lib/ui/quote/quote_screen.dart
index 1efc3730d..5a158da8d 100644
--- a/lib/ui/quote/quote_screen.dart
+++ b/lib/ui/quote/quote_screen.dart
@@ -39,8 +39,7 @@ class QuoteScreen extends StatelessWidget {
       isChecked: isInMultiselect &&
           listUIState.selectedIds.length == viewModel.quoteList.length,
       showCheckbox: isInMultiselect,
-      onHamburgerLongPress: () =>
-          store.dispatch(StartQuoteMultiselect()),
+      onHamburgerLongPress: () => store.dispatch(StartQuoteMultiselect()),
       onCheckboxChanged: (value) {
         final quotes = viewModel.quoteList
             .map<InvoiceEntity>((quoteId) => viewModel.quoteMap[quoteId])
diff --git a/lib/ui/settings/client_portal_vm.dart b/lib/ui/settings/client_portal_vm.dart
index 1e4548570..33c74595d 100644
--- a/lib/ui/settings/client_portal_vm.dart
+++ b/lib/ui/settings/client_portal_vm.dart
@@ -62,8 +62,7 @@ class ClientPortalVM {
             final completer = snackBarCompleter<Null>(
                 context, AppLocalization.of(context).savedSettings);
             store.dispatch(SaveCompanyRequest(
-                completer: completer,
-                company: settingsUIState.company));
+                completer: completer, company: settingsUIState.company));
             break;
           case EntityType.group:
             final completer = snackBarCompleter<GroupEntity>(
diff --git a/lib/ui/settings/company_details_vm.dart b/lib/ui/settings/company_details_vm.dart
index 6ec425a3c..c14eecbc3 100644
--- a/lib/ui/settings/company_details_vm.dart
+++ b/lib/ui/settings/company_details_vm.dart
@@ -62,8 +62,7 @@ class CompanyDetailsVM {
             final completer = snackBarCompleter<Null>(
                 context, AppLocalization.of(context).savedSettings);
             store.dispatch(SaveCompanyRequest(
-                completer: completer,
-                company: settingsUIState.company));
+                completer: completer, company: settingsUIState.company));
             break;
           case EntityType.group:
             final completer = snackBarCompleter<GroupEntity>(
diff --git a/lib/ui/settings/custom_fields_vm.dart b/lib/ui/settings/custom_fields_vm.dart
index aee4b8e39..0f864e1ed 100644
--- a/lib/ui/settings/custom_fields_vm.dart
+++ b/lib/ui/settings/custom_fields_vm.dart
@@ -56,8 +56,7 @@ class CustomFieldsVM {
               final completer = snackBarCompleter<Null>(
                   context, AppLocalization.of(context).savedSettings);
               store.dispatch(SaveCompanyRequest(
-                  completer: completer,
-                  company: settingsUIState.company));
+                  completer: completer, company: settingsUIState.company));
               break;
             case EntityType.group:
               final completer = snackBarCompleter<GroupEntity>(
diff --git a/lib/ui/settings/device_settings_list_vm.dart b/lib/ui/settings/device_settings_list_vm.dart
index 53e1b9db3..5c1dd52b4 100644
--- a/lib/ui/settings/device_settings_list_vm.dart
+++ b/lib/ui/settings/device_settings_list_vm.dart
@@ -123,7 +123,8 @@ class DeviceSettingsVM {
         if (value == AppLayout.mobile) {
           store.dispatch(ViewDashboard(navigator: Navigator.of(context)));
         } else {
-          store.dispatch(ViewMainScreen(navigator: Navigator.of(context), addDelay: true));
+          store.dispatch(
+              ViewMainScreen(navigator: Navigator.of(context), addDelay: true));
         }
       },
       onRequireAuthenticationChanged: (BuildContext context, bool value) async {
diff --git a/lib/ui/settings/email_settings_vm.dart b/lib/ui/settings/email_settings_vm.dart
index 8287ed739..ad20edeef 100644
--- a/lib/ui/settings/email_settings_vm.dart
+++ b/lib/ui/settings/email_settings_vm.dart
@@ -58,8 +58,7 @@ class EmailSettingsVM {
               final completer = snackBarCompleter<Null>(
                   context, AppLocalization.of(context).savedSettings);
               store.dispatch(SaveCompanyRequest(
-                  completer: completer,
-                  company: settingsUIState.company));
+                  completer: completer, company: settingsUIState.company));
               break;
             case EntityType.group:
               final completer = snackBarCompleter<GroupEntity>(
diff --git a/lib/ui/settings/generated_numbers_vm.dart b/lib/ui/settings/generated_numbers_vm.dart
index 1e7aecd05..ad11bacb2 100644
--- a/lib/ui/settings/generated_numbers_vm.dart
+++ b/lib/ui/settings/generated_numbers_vm.dart
@@ -63,8 +63,7 @@ class GeneratedNumbersVM {
               final completer = snackBarCompleter<Null>(
                   context, AppLocalization.of(context).savedSettings);
               store.dispatch(SaveCompanyRequest(
-                  completer: completer,
-                  company: settingsUIState.company));
+                  completer: completer, company: settingsUIState.company));
               break;
             case EntityType.group:
               final completer = snackBarCompleter<GroupEntity>(
diff --git a/lib/ui/settings/invoice_design_vm.dart b/lib/ui/settings/invoice_design_vm.dart
index 1d05d91fd..938d3354a 100644
--- a/lib/ui/settings/invoice_design_vm.dart
+++ b/lib/ui/settings/invoice_design_vm.dart
@@ -60,8 +60,7 @@ class InvoiceDesignVM {
               final completer = snackBarCompleter<Null>(
                   context, AppLocalization.of(context).savedSettings);
               store.dispatch(SaveCompanyRequest(
-                  completer: completer,
-                  company: settingsUIState.company));
+                  completer: completer, company: settingsUIState.company));
               break;
             case EntityType.group:
               final completer = snackBarCompleter<GroupEntity>(
diff --git a/lib/ui/settings/localization_vm.dart b/lib/ui/settings/localization_vm.dart
index ecc50dc4d..6ad016306 100644
--- a/lib/ui/settings/localization_vm.dart
+++ b/lib/ui/settings/localization_vm.dart
@@ -63,8 +63,7 @@ class LocalizationSettingsVM {
               final completer = snackBarCompleter<Null>(
                   context, AppLocalization.of(context).savedSettings);
               store.dispatch(SaveCompanyRequest(
-                  completer: completer,
-                  company: settingsUIState.company));
+                  completer: completer, company: settingsUIState.company));
               break;
             case EntityType.group:
               final completer = snackBarCompleter<GroupEntity>(
diff --git a/lib/ui/settings/product_settings_vm.dart b/lib/ui/settings/product_settings_vm.dart
index a5e040112..0fd6f74f2 100644
--- a/lib/ui/settings/product_settings_vm.dart
+++ b/lib/ui/settings/product_settings_vm.dart
@@ -49,8 +49,7 @@ class ProductSettingsVM {
           final completer = snackBarCompleter<Null>(
               context, AppLocalization.of(context).savedSettings);
           store.dispatch(SaveCompanyRequest(
-              completer: completer,
-              company: settingsUIState.company));
+              completer: completer, company: settingsUIState.company));
         });
   }
 
diff --git a/lib/ui/settings/tax_settings_vm.dart b/lib/ui/settings/tax_settings_vm.dart
index 727448fe5..573c88969 100644
--- a/lib/ui/settings/tax_settings_vm.dart
+++ b/lib/ui/settings/tax_settings_vm.dart
@@ -57,8 +57,7 @@ class TaxSettingsVM {
           final completer = snackBarCompleter<Null>(
               context, AppLocalization.of(context).savedSettings);
           store.dispatch(SaveCompanyRequest(
-              completer: completer,
-              company: settingsUIState.company));
+              completer: completer, company: settingsUIState.company));
         },
         onConfigureRatesPressed: (context) {
           if (state.taxRateState.list.isEmpty) {
diff --git a/lib/ui/settings/templates_and_reminders_vm.dart b/lib/ui/settings/templates_and_reminders_vm.dart
index 6a0294064..9155cfe18 100644
--- a/lib/ui/settings/templates_and_reminders_vm.dart
+++ b/lib/ui/settings/templates_and_reminders_vm.dart
@@ -59,8 +59,7 @@ class TemplatesAndRemindersVM {
             final completer = snackBarCompleter<Null>(
                 context, AppLocalization.of(context).savedSettings);
             store.dispatch(SaveCompanyRequest(
-                completer: completer,
-                company: settingsUIState.company));
+                completer: completer, company: settingsUIState.company));
             break;
           case EntityType.group:
             final completer = snackBarCompleter<GroupEntity>(
diff --git a/lib/ui/settings/user_details_vm.dart b/lib/ui/settings/user_details_vm.dart
index 853c9b2bf..1f45d47fc 100644
--- a/lib/ui/settings/user_details_vm.dart
+++ b/lib/ui/settings/user_details_vm.dart
@@ -46,8 +46,7 @@ class UserDetailsVM {
           final completer = snackBarCompleter<Null>(
               context, AppLocalization.of(context).savedSettings);
           store.dispatch(SaveUserSettingsRequest(
-              completer: completer,
-              user: state.uiState.settingsUIState.user));
+              completer: completer, user: state.uiState.settingsUIState.user));
         });
   }
 
diff --git a/lib/ui/settings/workflow_vm.dart b/lib/ui/settings/workflow_vm.dart
index c6ff7dde5..4bf5a28db 100644
--- a/lib/ui/settings/workflow_vm.dart
+++ b/lib/ui/settings/workflow_vm.dart
@@ -58,8 +58,7 @@ class WorkflowSettingsVM {
               final completer = snackBarCompleter<Null>(
                   context, AppLocalization.of(context).savedSettings);
               store.dispatch(SaveCompanyRequest(
-                  completer: completer,
-                  company: settingsUIState.company));
+                  completer: completer, company: settingsUIState.company));
               break;
             case EntityType.group:
               final completer = snackBarCompleter<GroupEntity>(
diff --git a/lib/ui/task/task_screen.dart b/lib/ui/task/task_screen.dart
index e0e8bcd05..46dbdeed7 100644
--- a/lib/ui/task/task_screen.dart
+++ b/lib/ui/task/task_screen.dart
@@ -38,8 +38,7 @@ class TaskScreen extends StatelessWidget {
       isChecked: isInMultiselect &&
           listUIState.selectedIds.length == viewModel.taskList.length,
       showCheckbox: isInMultiselect,
-      onHamburgerLongPress: () =>
-          store.dispatch(StartTaskMultiselect()),
+      onHamburgerLongPress: () => store.dispatch(StartTaskMultiselect()),
       onCheckboxChanged: (value) {
         final tasks = viewModel.taskList
             .map<TaskEntity>((taskId) => viewModel.taskMap[taskId])
diff --git a/lib/ui/tax_rate/tax_rate_screen.dart b/lib/ui/tax_rate/tax_rate_screen.dart
index 86800165a..aa858502c 100644
--- a/lib/ui/tax_rate/tax_rate_screen.dart
+++ b/lib/ui/tax_rate/tax_rate_screen.dart
@@ -38,8 +38,7 @@ class TaxRateSettingsScreen extends StatelessWidget {
       isChecked: isInMultiselect &&
           listUIState.selectedIds.length == viewModel.taxRateList.length,
       showCheckbox: isInMultiselect,
-      onHamburgerLongPress: () =>
-          store.dispatch(StartTaxRateMultiselect()),
+      onHamburgerLongPress: () => store.dispatch(StartTaxRateMultiselect()),
       onBackPressed: () => store.dispatch(ViewSettings(
           navigator: Navigator.of(context), section: kSettingsTaxSettings)),
       onCheckboxChanged: (value) {
diff --git a/lib/ui/user/user_screen.dart b/lib/ui/user/user_screen.dart
index 3d9c085ba..bccd4e639 100644
--- a/lib/ui/user/user_screen.dart
+++ b/lib/ui/user/user_screen.dart
@@ -39,8 +39,7 @@ class UserScreen extends StatelessWidget {
       isChecked: isInMultiselect &&
           listUIState.selectedIds.length == viewModel.userList.length,
       showCheckbox: isInMultiselect,
-      onHamburgerLongPress: () =>
-          store.dispatch(StartUserMultiselect()),
+      onHamburgerLongPress: () => store.dispatch(StartUserMultiselect()),
       onCheckboxChanged: (value) {
         /*
         final users = viewModel.userList
diff --git a/lib/ui/user/view/user_view_vm.dart b/lib/ui/user/view/user_view_vm.dart
index b391d9cac..122f8888c 100644
--- a/lib/ui/user/view/user_view_vm.dart
+++ b/lib/ui/user/view/user_view_vm.dart
@@ -87,8 +87,7 @@ class UserViewVM {
           case EntityType.invoice:
             if (longPress && user.isActive) {
               createEntity(
-                  context: context,
-                  entity: InvoiceEntity(state: state));
+                  context: context, entity: InvoiceEntity(state: state));
             } else {
               viewEntitiesByType(
                   context: context,
@@ -111,8 +110,7 @@ class UserViewVM {
           case EntityType.payment:
             if (longPress && user.isActive) {
               createEntity(
-                  context: context,
-                  entity: PaymentEntity(state: state));
+                  context: context, entity: PaymentEntity(state: state));
             } else {
               viewEntitiesByType(
                   context: context,
@@ -132,10 +130,7 @@ class UserViewVM {
             break;
           case EntityType.task:
             if (longPress && user.isActive) {
-              createEntity(
-                  context: context,
-                  entity:
-                      TaskEntity(state: state));
+              createEntity(context: context, entity: TaskEntity(state: state));
             } else {
               viewEntitiesByType(
                   context: context,
diff --git a/lib/ui/vendor/view/vendor_view_vm.dart b/lib/ui/vendor/view/vendor_view_vm.dart
index df561e116..4899d7374 100644
--- a/lib/ui/vendor/view/vendor_view_vm.dart
+++ b/lib/ui/vendor/view/vendor_view_vm.dart
@@ -89,11 +89,12 @@ class VendorViewVM {
             if (longPress && vendor.isActive) {
               createEntity(
                   context: context,
-                  entity:
-                      ExpenseEntity(state: state, vendor: vendor));
+                  entity: ExpenseEntity(state: state, vendor: vendor));
             } else {
               viewEntitiesByType(
-                  context: context, entityType: EntityType.expense, filterEntity: vendor);
+                  context: context,
+                  entityType: EntityType.expense,
+                  filterEntity: vendor);
             }
             break;
         }
diff --git a/lib/utils/i18n.dart b/lib/utils/i18n.dart
index 81d93c568..925f8012a 100644
--- a/lib/utils/i18n.dart
+++ b/lib/utils/i18n.dart
@@ -15767,7 +15767,8 @@ mixin LocalizationsProvider on LocaleCodeAware {
 
   String get newPayment => _localizedValues[localeCode]['new_payment'];
 
-  String get switchListTable => _localizedValues[localeCode]['switch_list_table'];
+  String get switchListTable =>
+      _localizedValues[localeCode]['switch_list_table'];
 
   String lookup(String key) {
     final lookupKey = toSnakeCase(key);