From 745daf39f7029b2b6729427bb7b6ef390deb6c41 Mon Sep 17 00:00:00 2001
From: Neeraj Gupta <254676+ua741@users.noreply.github.com>
Date: Thu, 2 May 2024 12:14:08 +0530
Subject: [PATCH 1/2] [mob] Sort suggestion by creationTime to fix gallery
 grouping bug

---
 mobile/lib/ui/viewer/people/person_cluster_suggestion.dart | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mobile/lib/ui/viewer/people/person_cluster_suggestion.dart b/mobile/lib/ui/viewer/people/person_cluster_suggestion.dart
index 2a6a05581f..babe818974 100644
--- a/mobile/lib/ui/viewer/people/person_cluster_suggestion.dart
+++ b/mobile/lib/ui/viewer/people/person_cluster_suggestion.dart
@@ -79,6 +79,7 @@ class _PersonClustersState extends State<PersonReviewClusterSuggestion> {
             final double distance = currentSuggestion.distancePersonToCluster;
             final bool usingMean = currentSuggestion.usedOnlyMeanForSuggestion;
             final List<EnteFile> files = currentSuggestion.filesInCluster;
+            files.sort((a, b) => b.creationTime!.compareTo(a.creationTime!));
 
             _peopleChangedEvent =
                 Bus.instance.on<PeopleChangedEvent>().listen((event) {

From 88bdb06d05b64475d95bb7655262a26ddbf93884 Mon Sep 17 00:00:00 2001
From: Neeraj Gupta <254676+ua741@users.noreply.github.com>
Date: Thu, 2 May 2024 14:22:24 +0530
Subject: [PATCH 2/2] [mob] Keep original files order intact

---
 .../ui/viewer/people/person_cluster_suggestion.dart   | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/mobile/lib/ui/viewer/people/person_cluster_suggestion.dart b/mobile/lib/ui/viewer/people/person_cluster_suggestion.dart
index babe818974..d7729351b4 100644
--- a/mobile/lib/ui/viewer/people/person_cluster_suggestion.dart
+++ b/mobile/lib/ui/viewer/people/person_cluster_suggestion.dart
@@ -79,7 +79,6 @@ class _PersonClustersState extends State<PersonReviewClusterSuggestion> {
             final double distance = currentSuggestion.distancePersonToCluster;
             final bool usingMean = currentSuggestion.usedOnlyMeanForSuggestion;
             final List<EnteFile> files = currentSuggestion.filesInCluster;
-            files.sort((a, b) => b.creationTime!.compareTo(a.creationTime!));
 
             _peopleChangedEvent =
                 Bus.instance.on<PeopleChangedEvent>().listen((event) {
@@ -95,10 +94,14 @@ class _PersonClustersState extends State<PersonReviewClusterSuggestion> {
 
             return InkWell(
               onTap: () {
+                final List<EnteFile> sortedFiles =
+                    List<EnteFile>.from(currentSuggestion.filesInCluster);
+                sortedFiles
+                    .sort((a, b) => b.creationTime!.compareTo(a.creationTime!));
                 Navigator.of(context).push(
                   MaterialPageRoute(
                     builder: (context) => ClusterPage(
-                      files,
+                      sortedFiles,
                       personID: widget.person,
                       clusterID: clusterID,
                     ),
@@ -216,9 +219,7 @@ class _PersonClustersState extends State<PersonReviewClusterSuggestion> {
               start: 4,
             ),
           ),
-        const SizedBox(
-          height: 24.0,
-        ),
+        const SizedBox(height: 24.0),
         Text(
           "${files.length} photos",
           style: getEnteTextTheme(context).body,