Merge branch 'develop'

invoiceninja · Nov 13, 2023 · 712d60b · 712d60b
2 parents b917c93 + 46293cf
commit 712d60b
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 3 deletions.
diff --git a/android/build.gradle b/android/build.gradle
@@ -25,6 +25,6 @@ subprojects {
     project.evaluationDependsOn(':app')
 }
 
-task clean(type: Delete) {
+tasks.register("clean", Delete) {
     delete rootProject.buildDir
 }
diff --git a/lib/data/models/invoice_model.dart b/lib/data/models/invoice_model.dart
@@ -1794,6 +1794,7 @@ abstract class InvitationEntity extends Object
       sentDate: '',
       viewedDate: '',
       openedDate: '',
+      messageId: '',
       updatedAt: 0,
       archivedAt: 0,
       isDeleted: false,
@@ -1835,6 +1836,9 @@ abstract class InvitationEntity extends Object
   @BuiltValueField(wireName: 'email_error', compare: false)
   String get emailError;
 
+  @BuiltValueField(wireName: 'message_id', compare: false)
+  String get messageId;
+
   String get downloadLink =>
       '$link/download?t=${DateTime.now().millisecondsSinceEpoch}';
 
@@ -1903,7 +1907,8 @@ abstract class InvitationEntity extends Object
     ..clientContactId = ''
     ..vendorContactId = ''
     ..emailError = ''
-    ..emailStatus = '';
+    ..emailStatus = ''
+    ..messageId = '';
 
   static Serializer<InvitationEntity> get serializer =>
       _$invitationEntitySerializer;

diff --git a/lib/data/models/invoice_model.g.dart b/lib/data/models/invoice_model.g.dart
diff --git a/lib/ui/invoice/edit/invoice_edit_contacts.dart b/lib/ui/invoice/edit/invoice_edit_contacts.dart
@@ -181,7 +181,9 @@ class _ClientContactListTile extends StatelessWidget {
                         style: Theme.of(context).textTheme.bodySmall,
                       ),
                     ),
-                  if ((invitation?.emailError ?? '').isNotEmpty)
+                  if ((invitation?.emailError ?? '').isNotEmpty &&
+                      invitation?.emailStatus !=
+                          InvitationEntity.EMAIL_STATUS_DELIVERED)
                     Padding(
                       padding: const EdgeInsets.only(top: 8),
                       child: Text(