merge main

# Conflicts: # mobile/drift_schemas/main/drift_schema_v10.json # mobile/lib/infrastructure/repositories/db.repository.dart # mobile/lib/infrastructure/repositories/db.repository.drift.dart # mobile/lib/infrastructure/repositories/db.repository.steps.dart # mobile/test/drift/main/generated/schema_v10.dart
2025-09-09 01:06:03 +05:30
parent 67fb9b7a2a 59accbf32a
commit 53fc603d91
52 changed files with 2515 additions and 789 deletions
@@ -147,7 +147,9 @@ class SyncService {
      dbUsers,
      compare: (UserDto a, UserDto b) => a.id.compareTo(b.id),
      both: (UserDto a, UserDto b) {
-        if (!a.updatedAt.isAtSameMomentAs(b.updatedAt) ||
+        if ((a.updatedAt == null && b.updatedAt != null) ||
+            (a.updatedAt != null && b.updatedAt == null) ||
+            (a.updatedAt != null && b.updatedAt != null && !a.updatedAt!.isAtSameMomentAs(b.updatedAt!)) ||
            a.isPartnerSharedBy != b.isPartnerSharedBy ||
            a.isPartnerSharedWith != b.isPartnerSharedWith ||
            a.inTimeline != b.inTimeline) {