Null safety

lib/data/repositories/transaction_repository.dart

@@ -94,8 +94,7 @@ class TransactionRepository {
               .map((transactionId) => {
                     'id': transactionId,
                     if (vendorId.isNotEmpty) 'vendor_id': vendorId,
-                    if (categoryId.isNotEmpty)
+                    if (categoryId.isNotEmpty) 'ninja_category_id': categoryId,
-                      'ninja_category_id': categoryId,
                   })
               .toList()
         },

lib/main_app.dart

@@ -368,8 +368,7 @@ class InvoiceNinjaAppState extends State<InvoiceNinjaApp> {
                       data: data.copyWith(
                         textScaleFactor: state.prefState.textScaleFactor,
                         alwaysUse24HourFormat:
-                            state.company?.settings.enableMilitaryTime ??
+                            state.company?.settings.enableMilitaryTime ?? false,
-                                false,
                       ),
                       child: child!,
                     );

lib/redux/dashboard/dashboard_state.dart

@@ -108,8 +108,7 @@ abstract class DashboardUISettings
   String get groupBy;
 
   bool matchesCurrency(String? match) {
-    if (currencyId.isEmpty ||
+    if (currencyId.isEmpty || currencyId == kCurrencyAll) {
-        currencyId == kCurrencyAll) {
       return true;
     }
 

lib/redux/document/document_actions.dart

@@ -491,24 +491,24 @@ void handleDocumentAction(
                           .dispatch(LoadCredit(creditId: document.parentId)));
                       break;
                     case EntityType.expense:
-                      completer.future.then<Null>((_) => store.dispatch(
+                      completer.future.then<Null>((_) => store
-                          LoadExpense(expenseId: document.parentId)));
+                          .dispatch(LoadExpense(expenseId: document.parentId)));
                       break;
                     case EntityType.group:
                       completer.future.then<Null>((_) => store
                           .dispatch(LoadGroup(groupId: document.parentId)));
                       break;
                     case EntityType.invoice:
-                      completer.future.then<Null>((_) => store.dispatch(
+                      completer.future.then<Null>((_) => store
-                          LoadInvoice(invoiceId: document.parentId)));
+                          .dispatch(LoadInvoice(invoiceId: document.parentId)));
                       break;
                     case EntityType.product:
-                      completer.future.then<Null>((_) => store.dispatch(
+                      completer.future.then<Null>((_) => store
-                          LoadProduct(productId: document.parentId)));
+                          .dispatch(LoadProduct(productId: document.parentId)));
                       break;
                     case EntityType.project:
-                      completer.future.then<Null>((_) => store.dispatch(
+                      completer.future.then<Null>((_) => store
-                          LoadProject(projectId: document.parentId)));
+                          .dispatch(LoadProject(projectId: document.parentId)));
                       break;
                     case EntityType.purchaseOrder:
                       completer.future.then<Null>((_) => store.dispatch(

lib/redux/purchase_order/purchase_order_actions.dart

@@ -728,8 +728,7 @@ void handlePurchaseOrderAction(BuildContext? context,
                   onPressed: () {
                     Navigator.of(context).pop();
                     editEntity(
-                        entity:
+                        entity: state.vendorState.get(purchaseOrder!.vendorId));
-                            state.vendorState.get(purchaseOrder!.vendorId));
                   },
                   child: Text(localization.editVendor.toUpperCase()))
             ]);

lib/ui/app/app_bottom_bar.dart

@@ -378,7 +378,8 @@ class _AppBottomBarState extends State<AppBottomBar> {
             final settings = state.userCompany.settings.rebuild((b) => b
               ..tableColumns['${widget.entityType}'] =
                   BuiltList<String>(selected));
-            final userCompany = state.userCompany.rebuild((b) => b..settings.replace(settings));
+            final userCompany =
+                state.userCompany.rebuild((b) => b..settings.replace(settings));
             final user =
                 state.user.rebuild((b) => b..userCompany.replace(userCompany));
             final completer = snackBarCompleter<Null>(

lib/ui/auth/login_vm.dart

@@ -248,8 +248,7 @@ class LoginVM {
               provider: UserEntity.OAUTH_PROVIDER_MICROSOFT,
               oneTimePassword: oneTimePassword,
             ));
-            completer.future
+            completer.future.then<Null>((_) => _handleLogin(context: context));
-                .then<Null>((_) => _handleLogin(context: context));
           }, (dynamic error) {
             completer.completeError(error);
           });
@@ -359,8 +358,8 @@ class LoginVM {
           email: email.trim(),
           password: password.trim(),
         ));
-        completer.future.then<Null>(
+        completer.future
-            (_) => _handleLogin(context: context, isSignUp: true));
+            .then<Null>((_) => _handleLogin(context: context, isSignUp: true));
       },
       onRecoverPressed: (
         BuildContext context,

lib/ui/client/edit/client_edit_contacts.dart

@@ -46,8 +46,8 @@ class _ClientEditContactsState extends State<ClientEditContacts> {
             key: Key(contact!.entityKey),
             contact: contact,
             isDialog: client.contacts.length > 1,
-            index: client.contacts.indexOf(
+            index: client.contacts
-                client.contacts.firstWhere((c) => c.id == contact.id)),
+                .indexOf(client.contacts.firstWhere((c) => c.id == contact.id)),
           );
         });
   }

lib/ui/credit/credit_presenter.dart

@@ -137,8 +137,7 @@ class CreditPresenter extends EntityPresenter {
       case CreditFields.clientPostalCode:
         return Text(client.postalCode);
       case CreditFields.clientCountry:
-        return Text(
+        return Text(state.staticState.countryMap[client.countryId]?.name ?? '');
-            state.staticState.countryMap[client.countryId]?.name ?? '');
       case CreditFields.contactName:
       case CreditFields.contactEmail:
         final contact = creditContactSelector(

lib/ui/dashboard/dashboard_panels.dart

@@ -607,7 +607,8 @@ class DashboardPanels extends StatelessWidget {
                         child: StaggeredGrid.count(
                           crossAxisCount: isMobile(context)
                               ? userCompanySettings.dashboardFieldsPerRowMobile
-                              : userCompanySettings.dashboardFieldsPerRowDesktop,
+                              : userCompanySettings
+                                  .dashboardFieldsPerRowDesktop,
                           crossAxisSpacing: 8,
                           mainAxisSpacing: 12,
                           children: state.userCompany.settings.dashboardFields
@@ -1121,7 +1122,8 @@ class __DashboardSettingsState extends State<_DashboardSettings> {
             onPressed: () {
               final completer = snackBarCompleter<Null>(
                   context, AppLocalization.of(context)!.savedSettings);
-              final user = state.user.rebuild((b) => b..userCompany.replace(state.userCompany));
+              final user = state.user
+                  .rebuild((b) => b..userCompany.replace(state.userCompany));
               store.dispatch(
                 SaveUserSettingsRequest(
                   completer: completer,

lib/ui/invoice/edit/invoice_edit_desktop.dart

@@ -315,10 +315,12 @@ class InvoiceEditDesktopState extends State<InvoiceEditDesktop>
                             InkWell(
                               onLongPress: () => editEntity(
                                   entity: invoice.isPurchaseOrder
-                                      ? vendor: client),
+                                      ? vendor
+                                      : client),
                               onTap: () => viewEntity(
                                   entity: invoice.isPurchaseOrder
-                                      ? vendor: client),
+                                      ? vendor
+                                      : client),
                               child: ConstrainedBox(
                                 constraints: BoxConstraints(
                                     minWidth: double.infinity, minHeight: 40),
@@ -328,7 +330,8 @@ class InvoiceEditDesktopState extends State<InvoiceEditDesktop>
                                     EntityPresenter()
                                         .initialize(
                                             invoice.isPurchaseOrder
-                                                ? vendor: client,
+                                                ? vendor
+                                                : client,
                                             context)
                                         .title()!,
                                     style:

lib/ui/invoice/edit/invoice_edit_vm.dart

@@ -206,7 +206,8 @@ class InvoiceEditVM extends AbstractInvoiceEditVM {
           store.dispatch(UpdateInvoice(invoice.rebuild((b) => b
             ..clientId = clientId ?? ''
             ..projectId = projectId ?? ''
-            ..invitations.replace(BuiltList<InvitationEntity>(client.emailContacts
+            ..invitations.replace(BuiltList<InvitationEntity>(client
+                .emailContacts
                 .map(
                     (contact) => InvitationEntity(clientContactId: contact!.id))
                 .toList())))));

lib/ui/invoice/invoice_list_item.dart

@@ -190,8 +190,7 @@ class InvoiceListItem extends StatelessWidget {
               : ListTile(
                   onTap: () => onTap != null
                       ? onTap!()
-                      : selectEntity(
+                      : selectEntity(entity: invoice, forceView: !showCheckbox),
-                          entity: invoice, forceView: !showCheckbox),
                   onLongPress: () => onTap != null
                       ? null
                       : selectEntity(entity: invoice, longPress: true),

lib/ui/invoice/invoice_presenter.dart

@@ -164,8 +164,7 @@ class InvoicePresenter extends EntityPresenter {
       case InvoiceFields.clientPostalCode:
         return Text(client.postalCode);
       case InvoiceFields.clientCountry:
-        return Text(
+        return Text(state.staticState.countryMap[client.countryId]?.name ?? '');
-            state.staticState.countryMap[client.countryId]?.name ?? '');
       case InvoiceFields.contactName:
       case InvoiceFields.contactEmail:
         final contact = invoiceContactSelector(

lib/ui/invoice/view/invoice_view_overview.dart

@@ -343,7 +343,7 @@ class InvoiceOverview extends StatelessWidget {
           EntityListTile(
             isFilter: isFilter,
             entity: payment,
-            subtitle: amount+ ' • ' + formatDate(payment.date, context),
+            subtitle: amount + ' • ' + formatDate(payment.date, context),
           ),
         );
       });
@@ -373,7 +373,7 @@ class InvoiceOverview extends StatelessWidget {
           EntityListTile(
             isFilter: isFilter,
             entity: credit,
-            subtitle: amount+ ' • ' + formatDate(credit.date, context),
+            subtitle: amount + ' • ' + formatDate(credit.date, context),
           ),
         );
       });

lib/ui/payment_term/edit/payment_term_edit.dart

@@ -104,9 +104,8 @@ class _PaymentTermEditState extends State<PaymentTermEdit> {
                       keyboardType: TextInputType.number,
                       controller: _numDaysController,
                       label: localization.numberOfDays,
-                      validator: (value) => value.isEmpty
+                      validator: (value) =>
-                          ? localization.pleaseEnterAValue
+                          value.isEmpty ? localization.pleaseEnterAValue : null,
-                          : null,
                       onSavePressed: (context) => _onSavePressed(),
                     ),
                   ],

lib/ui/purchase_order/purchase_order_presenter.dart

@@ -135,8 +135,7 @@ class PurchaseOrderPresenter extends EntityPresenter {
       case PurchaseOrderFields.vendorPostalCode:
         return Text(vendor.postalCode);
       case PurchaseOrderFields.vendorCountry:
-        return Text(
+        return Text(state.staticState.countryMap[client.countryId]?.name ?? '');
-            state.staticState.countryMap[client.countryId]?.name ?? '');
       case PurchaseOrderFields.contactName:
       case PurchaseOrderFields.contactEmail:
         final contact = purchaseOrderContactSelector(

lib/ui/quote/quote_presenter.dart

@@ -131,8 +131,7 @@ class QuotePresenter extends EntityPresenter {
       case QuoteFields.clientPostalCode:
         return Text(client.postalCode);
       case QuoteFields.clientCountry:
-        return Text(
+        return Text(state.staticState.countryMap[client.countryId]?.name ?? '');
-            state.staticState.countryMap[client.countryId]?.name ?? '');
       case QuoteFields.contactName:
       case QuoteFields.contactEmail:
         final contact =

lib/ui/recurring_invoice/recurring_invoice_list_item.dart

@@ -222,8 +222,8 @@ class RecurringInvoiceListItem extends StatelessWidget {
                                             (invoice.nextSendDate.isNotEmpty
                                                 ? ' • '
                                                 : '') +
-                                            formatDate(invoice.nextSendDate,
+                                            formatDate(
-                                                context) +
+                                                invoice.nextSendDate, context) +
                                             (invoice.documents.isNotEmpty
                                                 ? '  📎'
                                                 : ''))

lib/ui/reports/reports_screen.dart

@@ -646,7 +646,8 @@ class _ReportDataTableState extends State<ReportDataTable> {
     final reportResult = viewModel.reportResult!;
     final reportState = viewModel.reportState;
     final settings = state.userCompany.settings;
-    final reportSettings = settings.reportSettings.containsKey(reportState.report)
+    final reportSettings =
+        settings.reportSettings.containsKey(reportState.report)
             ? settings.reportSettings[reportState.report]!
             : ReportSettingsEntity();
     final sortedColumns = reportResult.sortedColumns(reportState);
@@ -714,7 +715,8 @@ class TotalsDataTable extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return mt.DataTable(
-      sortColumnIndex: reportResult!.columns.length > reportSettings!.sortTotalsIndex
+      sortColumnIndex:
+          reportResult!.columns.length > reportSettings!.sortTotalsIndex
               ? reportSettings!.sortTotalsIndex
               : null,
       sortAscending: reportSettings!.sortTotalsAscending ?? true,
@@ -1481,7 +1483,8 @@ class ReportResult {
     final state = store.state;
     final reportState = state.uiState.reportsUIState;
     final settings = state.userCompany.settings;
-    final reportSettings = settings.reportSettings.containsKey(reportState.report)
+    final reportSettings =
+        settings.reportSettings.containsKey(reportState.report)
             ? settings.reportSettings[reportState.report]!
             : ReportSettingsEntity();
 

lib/ui/schedule/edit/schedule_edit.dart

@@ -324,8 +324,8 @@ class _ScheduleEditState extends State<ScheduleEdit> {
                         HelpText(localization.allClients),
                       for (var clientId in parameters.clients!)
                         ListTile(
-                          title: Text(
+                          title:
-                              state.clientState.get(clientId).displayName),
+                              Text(state.clientState.get(clientId).displayName),
                           trailing: IconButton(
                             icon: Icon(Icons.clear),
                             onPressed: () {

lib/ui/schedule/view/schedule_view.dart

@@ -77,7 +77,8 @@ class _ScheduleViewState extends State<ScheduleView> {
                   ? localization.allClients
                   : parameters.clients!.length == 1
                       ? state.clientState
-                          .get(parameters.clients!.first).displayName
+                          .get(parameters.clients!.first)
+                          .displayName
                       : '${parameters.clients!.length} ${localization.clients}',
               localization.dateRange: localization.lookup(parameters.dateRange),
               localization.showAgingTable: parameters.showAgingTable!

lib/ui/settings/user_details.dart

@@ -277,8 +277,8 @@ class _UserDetailsState extends State<UserDetails>
               .toUpperCase(),
           textAlign: TextAlign.center,
         ),
-        onPressed: state.user.isConnectedToGoogle ||
+        onPressed:
-                state.user.isConnectedToMicrosoft
+            state.user.isConnectedToGoogle || state.user.isConnectedToMicrosoft
                 ? null
                 : () {
                     if (state.settingsUIState.isChanged) {

lib/ui/subscription/subscription_list_vm.dart

@@ -106,8 +106,8 @@ class SubscriptionListVM {
               EntityAction action) =>
           handleSubscriptionAction(context, subscriptions, action),
       onRefreshed: (context) => _handleRefresh(context),
-      tableColumns: state.userCompany.settings
+      tableColumns:
-              .getTableColumns(EntityType.subscription) ??
+          state.userCompany.settings.getTableColumns(EntityType.subscription) ??
               SubscriptionPresenter.getDefaultTableFields(state.userCompany),
       onSortColumn: (field) => store.dispatch(SortSubscriptions(field)),
       onClearMultielsect: () => store.dispatch(ClearSubscriptionMultiselect()),

lib/ui/task/edit/task_edit.dart

@@ -229,8 +229,7 @@ class _BottomBar extends StatelessWidget {
                                 )!,
                               ),
                               context,
-                              clientId:
+                              clientId: state.clientState.get(task.clientId).id,
-                                  state.clientState.get(task.clientId).id,
                             )!;
                       }
 

lib/ui/transaction/transaction_list_item.dart

@@ -120,7 +120,8 @@ class TransactionListItem extends StatelessWidget {
                                     style: textStyle),
                                 Text(
                                   state.bankAccountState
-                                      .get(transaction!.bankAccountId).name,
+                                      .get(transaction!.bankAccountId)
+                                      .name,
                                   maxLines: 3,
                                   overflow: TextOverflow.ellipsis,
                                   style: Theme.of(context)
@@ -212,7 +213,8 @@ class TransactionListItem extends StatelessWidget {
                         Expanded(
                           child: filterMatch == null
                               ? Text(state.bankAccountState
-                                      .get(transaction!.bankAccountId).name +
+                                      .get(transaction!.bankAccountId)
+                                      .name +
                                   ' • ' +
                                   (transaction!.isDeposit
                                       ? localization!.deposit!

lib/ui/transaction_rule/view/transaction_rule_view.dart

@@ -65,8 +65,8 @@ class _TransactionRuleViewState extends State<TransactionRuleView> {
                 : localization.disabled,
             localization.vendor:
                 state.vendorState.get(transactionRule.vendorId).name,
-            localization.category: state.expenseCategoryState
+            localization.category:
-                .get(transactionRule.categoryId).name,
+                state.expenseCategoryState.get(transactionRule.categoryId).name,
           }),
           if (transactionRule.rules.isNotEmpty) ...[
             Padding(

lib/ui/vendor/edit/vendor_edit_contacts.dart

@@ -45,8 +45,8 @@ class _VendorEditContactsState extends State<VendorEditContacts> {
             key: Key(contact!.entityKey),
             contact: contact,
             isDialog: vendor.contacts.length > 1,
-            index: vendor.contacts.indexOf(
+            index: vendor.contacts
-                vendor.contacts.firstWhere((c) => c.id == contact.id)),
+                .indexOf(vendor.contacts.firstWhere((c) => c.id == contact.id)),
           );
         });
   }