diff --git a/lib/ui/app/invoice/invoice_email_view.dart b/lib/ui/app/invoice/invoice_email_view.dart index d1f071c6b..39390e88c 100644 --- a/lib/ui/app/invoice/invoice_email_view.dart +++ b/lib/ui/app/invoice/invoice_email_view.dart @@ -184,17 +184,16 @@ class _InvoiceEmailViewState extends State final vendor = viewModel.vendor; final state = viewModel.state!; final settings = getClientSettings(state, client); - final contacts = invoice.invitations - .map((invitation) => - (invoice.isPurchaseOrder ? vendor!.contacts : client!.contacts) - .firstWhere( - (contact) => - contact.id == - (invoice.isPurchaseOrder - ? invitation.vendorContactId - : invitation.clientContactId), - orElse: () => ClientContactEntity())) - .toList(); + final contacts = invoice.invitations.map((invitation) { + final allContacts = + invoice.isPurchaseOrder ? vendor!.contacts : client!.contacts; + final matches = allContacts.where((contact) => + contact.id == + (invoice.isPurchaseOrder + ? invitation.vendorContactId + : invitation.clientContactId)); + return matches.isNotEmpty ? matches.first : null; + }).toList(); return Column( children: [